refactoring: Replace 'fprintf(stderr, ...' with 'g_printerr(...'

diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index ceb5a40..d888dbc 100644 (file)
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -321,7 +321,7 @@ main(int argc, char **argv)
 
     cmd_options = parse_arguments(&argc, &argv, &tmp_err);
     if (!cmd_options) {
-        fprintf(stderr, "Argument parsing failed: %s\n", tmp_err->message);
+        g_printerr("Argument parsing failed: %s\n", tmp_err->message);
         g_error_free(tmp_err);
         exit(EXIT_FAILURE);
     }
@@ -340,8 +340,8 @@ main(int argc, char **argv)
 
     if (argc != 2) {
         // No mandatory arguments
-        fprintf(stderr, "Must specify exactly one directory to index.\n");
-        fprintf(stderr, "Usage: %s [options] <directory_to_index>\n\n",
+        g_printerr("Must specify exactly one directory to index.\n");
+        g_printerr("Usage: %s [options] <directory_to_index>\n\n",
                          cr_get_filename(argv[0]));
         free_options(cmd_options);
         exit(EXIT_FAILURE);
@@ -369,7 +369,7 @@ main(int argc, char **argv)
     // Check if inputdir exists
 
     if (!g_file_test(in_dir, G_FILE_TEST_IS_DIR)) {
-        fprintf(stderr, "Directory %s must exist\n", in_dir);
+        g_printerr("Directory %s must exist\n", in_dir);
         g_free(in_dir);
         free_options(cmd_options);
         exit(EXIT_FAILURE);
@@ -379,7 +379,7 @@ main(int argc, char **argv)
     // Check parsed arguments
 
     if (!check_arguments(cmd_options, in_dir, &tmp_err)) {
-        fprintf(stderr, "%s\n", tmp_err->message);
+        g_printerr("%s\n", tmp_err->message);
         g_error_free(tmp_err);
         g_free(in_dir);
         free_options(cmd_options);
@@ -429,7 +429,7 @@ main(int argc, char **argv)
     // Prepare cachedir for checksum if --cachedir is used
 
     if (!prepare_cache_dir(cmd_options, out_dir, &tmp_err)) {
-        fprintf(stderr, "%s\n", tmp_err->message);
+        g_printerr("%s\n", tmp_err->message);
         g_error_free(tmp_err);
         g_free(in_dir);
         g_free(in_repo);

diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index 7cb683b..2c9dc28 100644 (file)
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -1564,10 +1564,10 @@ main(int argc, char **argv)
 
     if (g_slist_length(cmd_options->repo_list) < 2) {
         free_options(cmd_options);
-        fprintf(stderr, "Usage: %s [OPTION...] --repo=url --repo=url\n\n"
-                        "%s: take 2 or more repositories and merge their "
-                        "metadata into a new repo\n\n",
-                        cr_get_filename(argv[0]), cr_get_filename(argv[0]));
+        g_printerr("Usage: %s [OPTION...] --repo=url --repo=url\n\n"
+                   "%s: take 2 or more repositories and merge their "
+                   "metadata into a new repo\n\n",
+                   cr_get_filename(argv[0]), cr_get_filename(argv[0]));
         return 1;
     }
 

diff --git a/src/misc.c b/src/misc.c
index e5109ac..6162c5a 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -944,16 +944,16 @@ cr_log_fn(const gchar *log_domain,
 
     switch(log_level) {
         case G_LOG_LEVEL_ERROR:
-            if (log_domain) fprintf(stderr, "%s: ", log_domain);
-            fprintf(stderr, "Error: %s\n", message);
+            if (log_domain) g_printerr("%s: ", log_domain);
+            g_printerr("Error: %s\n", message);
             break;
         case G_LOG_LEVEL_CRITICAL:
-            if (log_domain) fprintf(stderr, "%s: ", log_domain);
-            fprintf(stderr, "Critical: %s\n", message);
+            if (log_domain) g_printerr("%s: ", log_domain);
+            g_printerr("Critical: %s\n", message);
             break;
         case G_LOG_LEVEL_WARNING:
-            if (log_domain) fprintf(stderr, "%s: ", log_domain);
-            fprintf(stderr, "Warning: %s\n", message);
+            if (log_domain) g_printerr("%s: ", log_domain);
+            g_printerr("Warning: %s\n", message);
             break;
         case G_LOG_LEVEL_DEBUG: {
             time_t rawtime;
@@ -964,8 +964,8 @@ cr_log_fn(const gchar *log_domain,
             timeinfo = localtime ( &rawtime );
             strftime (buffer, 80, "%H:%M:%S", timeinfo);
 
-            //if (log_domain) fprintf(stderr, "%s: ", log_domain);
-            fprintf(stderr, "%s: %s\n", buffer, message);
+            //if (log_domain) g_printerr("%s: ", log_domain);
+            g_printerr("%s: %s\n", buffer, message);
             break;
         }
         default: