2008-10-29 Marcus Brinkmann <[email protected]>

	* src/mkstrtable.awk: Make generated code -W clean to silence gcc
	warnings.

2 files changed, 16 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 97c5d51..116fc66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-29  Marcus Brinkmann  <[email protected]>
+
+	* src/mkstrtable.awk: Make generated code -W clean to silence gcc
+	warnings.
+
 2008-08-06  Werner Koch  <[email protected]>
 
 	* src/err-codes.h.in (GPG_ERR_NOT_OPERATIONAL): New.
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
index 31eb121..8135ba7 100644
--- a/src/mkstrtable.awk
+++ b/src/mkstrtable.awk
@@ -1,5 +1,5 @@
 # mkstrtable.awk
-# Copyright (C) 2003, 2004 g10 Code GmbH
+# Copyright (C) 2003, 2004, 2008 g10 Code GmbH
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -157,7 +157,10 @@ END {
   print "    " pos[coded_msgs];
   print "  };";
   print "";
-  print "#define " namespace "msgidxof(code) (0 ? -1 \\";
+  print "static inline int";
+  print namespace "msgidxof (int code)";
+  print "{";
+  print "  return (0 ? 0";
 
 # Gather the ranges.
   skip = code[0];
@@ -170,17 +173,17 @@ END {
       else
 	{
 	  print "  : ((code >= " start ") && (code <= " stop ")) ? (code - " \
-            skip ") \\";
+            skip ")";
 	  skip += code[i] - stop - 1;
 	  start = code[i];
 	  stop = code[i];
 	}
     }
   print "  : ((code >= " start ") && (code <= " stop ")) ? (code - " \
-    skip ") \\";
+    skip ")";
   if (has_default)
-    print "  : " stop + 1 " - " skip ")";
+    print "  : " stop + 1 " - " skip ");";
   else
-    print "  : -1)";
-    
- }
+    print "  : -1);";
+  print "}";
+}