Remove static string printfs in utilities (-Wformat)

Author: dajobe

utils/check_query.c

@@ -124,7 +124,7 @@ static int error_count = 0;
 
 static int verbose = 0;
 
-static const char *title_format_string = "Rasqal RDF query test utility %s\n";
+static const char *title_string = "Rasqal RDF query test utility";
 
 
 
@@ -361,7 +361,7 @@ main(int argc, char *argv[])
 
   if(usage) {
     if(usage > 1) {
-      fprintf(stderr, title_format_string, rasqal_version_string);
+      fputs(title_string, stderr); fputs(rasqal_version_string, stderr); putc('\n', stderr);
       fputs("Rasqal home page: ", stderr);
       fputs(rasqal_home_url_string, stderr);
       fputc('\n', stderr);
@@ -380,7 +380,7 @@ main(int argc, char *argv[])
   if(help) {
     int i;
 
-    printf(title_format_string, rasqal_version_string);
+    puts(title_string); puts(rasqal_version_string); putchar('\n');
     puts("Run an RDF query and check it against a known result.");
     printf("Usage: %s [OPTIONS] -g DATA -q QUERY-FILE -r RESULT-FILE\n\n", program);
 

utils/roqet.c

@@ -134,7 +134,7 @@ static int warning_count = 0;
 static int warning_level = -1;
 static int ignore_errors = 0;
 
-static const char *title_format_string = "Rasqal RDF query utility %s\n";
+static const char *title_string = "Rasqal RDF query utility ";
 
 #define MAX_QUERY_ERROR_REPORT_LEN 512
 
@@ -740,7 +740,7 @@ print_help(rasqal_world* world, raptor_world* raptor_world_ptr)
 {
   unsigned int i;
 
-  printf(title_format_string, rasqal_version_string);
+  puts(title_string); puts(rasqal_version_string); putchar('\n');
   puts("Run an RDF query against data into formatted results.");
   printf("Usage: %s [OPTIONS] <query URI> [base URI]\n", program);
   printf("       %s [OPTIONS] -e <query string> [base URI]\n", program);
@@ -1213,7 +1213,7 @@ main(int argc, char *argv[])
 
   if(usage) {
     if(usage > 1) {
-      fprintf(stderr, title_format_string, rasqal_version_string);
+      fputs(title_string, stderr); fputs(rasqal_version_string, stderr); putc('\n', stderr);
       fputs("Rasqal home page: ", stderr);
       fputs(rasqal_home_url_string, stderr);
       fputc('\n', stderr);

utils/srxread.c

@@ -53,7 +53,7 @@
 #endif
 
 
-static const char *title_format_string = "Rasqal RDF query results utility %s\n";
+static const char *title_string = "Rasqal RDF query results utility";
 
 static char *program = NULL;
 
@@ -95,7 +95,7 @@ main(int argc, char *argv[])
   if(argc < 2 || argc > 4) {
     int i;
 
-    printf(title_format_string, rasqal_version_string);
+    puts(title_string); puts(rasqal_version_string); putchar('\n');
     puts("Read an RDF Query results file in one format and print in another\n");
     printf("Usage: %s <results filename> [read format [write format]]\n\n",
            program);

utils/testrunner.c

@@ -103,7 +103,7 @@ static struct option long_options[] =
 static int error_count = 0;
 static int warning_count = 0;
 
-static const char *title_format_string = "Rasqal RDF test runner utility %s\n";
+static const char *title_string = "Rasqal RDF test runner utility";
 
 
 static void
@@ -146,7 +146,7 @@ testrunner_log_handler(void *data, raptor_log_message *message)
 static void
 print_help(rasqal_world* world, raptor_world* raptor_world_ptr)
 {
-  printf(title_format_string, rasqal_version_string);
+  puts(title_string); puts(rasqal_version_string); putchar('\n');
   puts("Run an RDF query test suite.");
   printf("Usage: %s [OPTIONS] <manifest URI> [base URI]\n", program);
 
@@ -264,7 +264,7 @@ main(int argc, char *argv[])
 
   if(usage) {
     if(usage > 1) {
-      fprintf(stderr, title_format_string, rasqal_version_string);
+      fputs(title_string, stderr); fputs(rasqal_version_string, stderr); putc('\n', stderr);
       fputs("Rasqal home page: ", stderr);
       fputs(rasqal_home_url_string, stderr);
       fputc('\n', stderr);