Ticket #611: quest-fix.patch

examples/quest.cc

@@ -69 +69 @@
     return strcmp(f1.s, f2.s) < 0;
 }
 
-inline bool operator<(const qp_flag & f, const char * s) {
-    return strcmp(f.s, s) < 0;
-}
-
-inline bool operator<(const char * s, const qp_flag & f) {
-    return strcmp(s, f.s) < 0;
-}
-
 static void show_usage() {
     cout << "Usage: "PROG_NAME" [OPTIONS] 'QUERY'\n"
 "NB: QUERY should be quoted to protect it from the shell.\n\n"
@@ -110 +102 @@
 }
 
 static unsigned
-decode_qp_flag(const char * f)
+decode_qp_flag(const char * s)
 {
+    qp_flag f;
+    f.s = s;
     const qp_flag * p = lower_bound(flag_tab, flag_tab + n_flag_tab, f);
     if (p == flag_tab + n_flag_tab || f < *p)
         return 0;