From a02d04c48b4938320cb6a5f2d31216da5d1d8d52 Mon Sep 17 00:00:00 2001 From: Laszlo Peter Date: Mon, 28 Jan 2002 19:55:29 +0000 Subject: [PATCH] s/__FUNCTION__/G_GNUC_FUNCTION/ ditto ditto ditto change "test $x == y" to 2002-01-28 Laszlo Peter * archiver/location.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * capplets/common/capplet-util.c: ditto * capplets/common/capplet-util.h: ditto * libbackground/preferences.c: ditto * applets/common/wrapper-script.in: change "test $x == y" to "test $x = y" for portability --- ChangeLog | 9 +++++++++ archiver/location.c | 6 +++--- capplets/common/capplet-util.c | 2 +- capplets/common/capplet-util.h | 4 ++-- capplets/common/wrapper-script.in | 2 +- libbackground/preferences.c | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 465005deb..3f0d16f97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-01-28 Laszlo Peter + + * archiver/location.c: s/__FUNCTION__/G_GNUC_FUNCTION/ + * capplets/common/capplet-util.c: ditto + * capplets/common/capplet-util.h: ditto + * libbackground/preferences.c: ditto + * applets/common/wrapper-script.in: change "test $x == y" to + "test $x = y" for portability + 2002-01-27 Richard Hestilow * Makefile.am (CLEANFILES): Rename as MAINTAINERCLEANFILES. diff --git a/archiver/location.c b/archiver/location.c index 248bc560c..a39f21bd5 100644 --- a/archiver/location.c +++ b/archiver/location.c @@ -679,11 +679,11 @@ location_do_rollback (Location *location, gchar *backend_id, xmlDocPtr doc) if (fflush (output) == EOF) g_critical ("%s: Could not dump buffer: %s", - __FUNCTION__, g_strerror (errno)); + G_GNUC_FUNCTION, g_strerror (errno)); if (fclose (output) == EOF) { g_critical ("%s: Could not close output stream: %s", - __FUNCTION__, g_strerror (errno)); + G_GNUC_FUNCTION, g_strerror (errno)); return FALSE; } @@ -724,7 +724,7 @@ location_delete (Location *location) if (rmdir (location->p->fullpath) == -1) g_warning ("%s: Could not remove directory: %s\n", - __FUNCTION__, g_strerror (errno)); + G_GNUC_FUNCTION, g_strerror (errno)); location->p->deleted = TRUE; } diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index d58d28236..02bc500c7 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -101,7 +101,7 @@ create_control_cb (BonoboGenericFactory *factory, const gchar *component_id) static const gchar *prefix1 = "OAFIID:Bonobo_Control_Capplet_"; - g_message ("%s: Enter", __FUNCTION__); + g_message ("%s: Enter", G_GNUC_FUNCTION); if (!strncmp (component_id, prefix1, strlen (prefix1))) { property_control = bonobo_property_control_new diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h index 6849912ab..9873bc011 100644 --- a/capplets/common/capplet-util.h +++ b/capplets/common/capplet-util.h @@ -32,9 +32,9 @@ /* Print a debugging message */ -#define DEBUG_MSG(str, args...) \ +#define DEBUG_MSG(str, ...) \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \ - getpid (), __FUNCTION__ , ## args) + getpid (), G_GNUC_FUNCTION, __VA_ARGS__) /* Retrieve a widget from the Glade object */ diff --git a/capplets/common/wrapper-script.in b/capplets/common/wrapper-script.in index c28048d75..15de09ddd 100644 --- a/capplets/common/wrapper-script.in +++ b/capplets/common/wrapper-script.in @@ -1,6 +1,6 @@ #!/bin/sh -if test "x$#" == "x0" +if test "x$#" = "x0" then @BINDIR@/gnomecc --run-capplet @CAPPLET_NAME@ else diff --git a/libbackground/preferences.c b/libbackground/preferences.c index a945e046d..ddf377bf4 100644 --- a/libbackground/preferences.c +++ b/libbackground/preferences.c @@ -250,7 +250,7 @@ bg_preferences_merge_entry (BGPreferences *prefs, else if (!strcmp (entry->key, "/desktop/gnome/background/wallpaper-type")) { prefs->wallpaper_type = gconf_value_get_int (value); } else { - g_warning ("%s: Unknown property: %s", __FUNCTION__, entry->key); + g_warning ("%s: Unknown property: %s", G_GNUC_FUNCTION, entry->key); } }