From 41bd5bb015197c84cbd7065fd6ef95675966f259 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 6 Dec 2002 23:17:41 +0000 Subject: Convert [sf]printf to g_[sf]printf, or, where appropriate g_printerr(). Fri Dec 6 18:07:48 2002 Owen Taylor * modules/indic/devanagari-x.c, pango/modules.c pango/pango-utils.c pango/pangoft2.c pango/querymodules.c: Convert [sf]printf to g_[sf]printf, or, where appropriate g_printerr(). (Based on patch from Matthias Clasen, #99321) * configure.in: Require glib-2.1.3. --- pango/querymodules.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'pango/querymodules.c') diff --git a/pango/querymodules.c b/pango/querymodules.c index 95c67d89..6b126409 100644 --- a/pango/querymodules.c +++ b/pango/querymodules.c @@ -33,7 +33,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#include +#include #if USE_LA_MODULES #define SOEXT ".la" @@ -102,7 +102,7 @@ query_module (const char *dir, const char *name) module = g_module_open (path, 0); if (!module) - fprintf(stderr, "Cannot load module %s: %s\n", path, g_module_error()); + g_printerr ("Cannot load module %s: %s\n", path, g_module_error ()); if (module && g_module_symbol (module, "script_engine_list", (gpointer *) &list) && @@ -131,25 +131,25 @@ query_module (const char *dir, const char *name) quoted_path = g_strdup (path); } - printf ("%s%s%s %s %s %s ", quote, quoted_path, quote, - engines[i].id, engines[i].engine_type, engines[i].render_type); + g_printf ("%s%s%s %s %s %s ", quote, quoted_path, quote, + engines[i].id, engines[i].engine_type, engines[i].render_type); g_free (quoted_path); for (j=0; j < engines[i].n_ranges; j++) { if (j != 0) - printf (" "); - printf ("%d-%d:%s", + g_printf (" "); + g_printf ("%d-%d:%s", engines[i].ranges[j].start, engines[i].ranges[j].end, engines[i].ranges[j].langs); } - printf ("\n"); + g_printf ("\n"); } } else { - fprintf (stderr, "%s does not export Pango module API\n", path); + g_printerr ("%s does not export Pango module API\n", path); } g_free (path); @@ -163,9 +163,9 @@ int main (int argc, char **argv) int i; char *path; - printf ("# Pango Modules file\n" - "# Automatically generated file, do not edit\n" - "#\n"); + g_printf ("# Pango Modules file\n" + "# Automatically generated file, do not edit\n" + "#\n"); if (argc == 1) /* No arguments given */ { @@ -179,7 +179,7 @@ int main (int argc, char **argv) "modules", NULL); - printf ("# ModulesPath = %s\n#\n", path); + g_printf ("# ModulesPath = %s\n#\n", path); dirs = pango_split_file_list (path); -- cgit v1.2.1