Remove unneeded dependency on glib-2.2.x by g_printf() & <glib/gprintf.h>

diff --git a/src/client/cmdline/cmd_cd.c b/src/client/cmdline/cmd_cd.c
index fbeb1b2..ef5b608 100644 (file)
--- a/src/client/cmdline/cmd_cd.c
+++ b/src/client/cmdline/cmd_cd.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "captive/client-directory.h"
-#include <glib/gprintf.h>
+#include <stdio.h>
 
 #include "cmd_cd.h"    /* self */
 #include "main.h"
@@ -145,5 +145,5 @@ const gchar *targetdir=cmdline_path_from_cwd(cmd_argv[0]);
                g_assert(g_path_is_absolute(cmdline_cwd));
                }
 
-       g_printf("Guest-OS CWD: %s\n",cmdline_cwd);
+       printf("Guest-OS CWD: %s\n",cmdline_cwd);
 }

diff --git a/src/client/cmdline/cmd_help.c b/src/client/cmdline/cmd_help.c
index 49a0149..f56d334 100644 (file)
--- a/src/client/cmdline/cmd_help.c
+++ b/src/client/cmdline/cmd_help.c
@@ -24,7 +24,7 @@
 #include <popt.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gprintf.h>
+#include <stdio.h>
 
 #include "cmd_help.h"  /* self */
 #include "main.h"      /* for cmdline_command_table */
@@ -58,5 +58,5 @@ int cmd_name_maxlen;
        for (commandp=cmdline_command_table+1;commandp->name;commandp++)
                cmd_name_maxlen=MAX(cmd_name_maxlen,(int)strlen(commandp->name));
        for (commandp=cmdline_command_table+1;commandp->name;commandp++)
-               g_printf("%-*s\t%s\n",cmd_name_maxlen,commandp->name,commandp->description);
+               printf("%-*s\t%s\n",cmd_name_maxlen,commandp->name,commandp->description);
 }

diff --git a/src/client/cmdline/cmd_lcd.c b/src/client/cmdline/cmd_lcd.c
index 3327495..c594fea 100644 (file)
--- a/src/client/cmdline/cmd_lcd.c
+++ b/src/client/cmdline/cmd_lcd.c
@@ -22,7 +22,7 @@
 #include <glib/gmessages.h>
 #include <glib/gerror.h>
 #include <popt.h>
-#include <glib/gprintf.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <glib/gstrfuncs.h>
@@ -67,6 +67,6 @@ gchar *currentdir;
                }
 
        currentdir=g_get_current_dir();
-       g_printf("Host-OS CWD: %s\n",currentdir);
+       printf("Host-OS CWD: %s\n",currentdir);
        g_free(currentdir);
 }

diff --git a/src/client/cmdline/file_info.c b/src/client/cmdline/file_info.c
index d659973..ba80df9 100644 (file)
--- a/src/client/cmdline/file_info.c
+++ b/src/client/cmdline/file_info.c
@@ -23,7 +23,7 @@
 #include <glib/gerror.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <glib/gstrfuncs.h>
-#include <glib/gprintf.h>
+#include <stdio.h>
 
 
 #include "file_info.h" /* self */
@@ -67,7 +67,7 @@ gchar *file_size;
                file_size=g_strdup_printf("%8s","???");
 
        /*      type pm sz nm */
-       g_printf("[%s] %s %s %s\n",file_type,file_perms,file_size,file_info->name);
+       printf("[%s] %s %s %s\n",file_type,file_perms,file_size,file_info->name);
        
        g_free(file_size);
 }

diff --git a/src/client/cmdline/main.c b/src/client/cmdline/main.c
index 4515c5a..29643c9 100644 (file)
--- a/src/client/cmdline/main.c
+++ b/src/client/cmdline/main.c
@@ -25,7 +25,7 @@
 #include <glib/gerror.h>
 #include <popt.h>
 #include <string.h>
-#include <glib/gprintf.h>
+#include <stdio.h>
 
 #include <captive/client.h>    /* for captive_init() */
 
@@ -161,7 +161,7 @@ void err_cleanup(GError **errp)
 
        if (!*errp)
                return;
-       g_printf("\nERROR: %s\n",(*errp)->message);
+       printf("\nERROR: %s\n",(*errp)->message);
        g_clear_error(errp);
 }
 

diff --git a/src/libcaptive/client/lib.c b/src/libcaptive/client/lib.c
index 909c12f..505a7d2 100644 (file)
--- a/src/libcaptive/client/lib.c
+++ b/src/libcaptive/client/lib.c
@@ -26,7 +26,6 @@
 #include "reactos/ntos/rtl.h"  /* for InitializeObjectAttributes() */
 #include "captive/unicode.h"
 #include <libgnomevfs/gnome-vfs-utils.h>       /* for gnome_vfs_unescape_string() */
-#include <glib/gprintf.h>
 #include "captive/client.h"
 
 

diff --git a/src/libcaptive/include/captive/macros.h b/src/libcaptive/include/captive/macros.h
index b5f23c1..0259c49 100644 (file)
--- a/src/libcaptive/include/captive/macros.h
+++ b/src/libcaptive/include/captive/macros.h
@@ -27,6 +27,7 @@
 #include <string.h>    /* for memset() */
 #include <glib/galloca.h>
 #include <glib/gmessages.h>
+#include <glib/gutils.h>       /* for g_snprintf(); glib-2.2.x+ it also has in <glib/gprintf.h> */
 
 
 G_BEGIN_DECLS