X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ffacility.c;h=f4c0acae6c939f6f488a31cbc6c9fd40d908c1fd;hb=0ce0410b124ac413dcb537dc523619910ee35791;hp=5b2c8ba4f2c76188427f47884fa192bc54dd1499;hpb=29e7c5b37d76ef85f8d0bebbe3d453c9a14e0d3f;p=lttv.git

diff --git a/ltt/branches/poly/ltt/facility.c b/ltt/branches/poly/ltt/facility.c
index 5b2c8ba4..f4c0acae 100644
--- a/ltt/branches/poly/ltt/facility.c
+++ b/ltt/branches/poly/ltt/facility.c
@@ -135,6 +135,7 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
       freeTypes(&fac->unnamed_types);
       sequence_dispose(&fac->unnamed_types);      
       g_free(fac);
+      if(generated) break; /* use the first good match */
     }
     else {
       g_warning("facility token was expected in file %s", in.name);
@@ -147,8 +148,11 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
   fclose(in.fp);
 open_error:
 
-  if(!generated)
-    g_warning("Cannot find facility %s, checksum 0x%X", f->name, f->checksum);
+  if(!generated) {
+    g_warning("Cannot find facility %s, checksum 0x%X",
+        g_quark_to_string(f->name), f->checksum);
+    ret = 1;
+  }
 
   return ret;
 }