Try compiling before committing, why don't you? Simple fixes for my stupid

Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>

	* glib/gstrfuncs.c glib/gstring.h: Try compiling
	before committing, why don't you? Simple fixes
	for my stupid typos.

diff --git a/ChangeLog b/ChangeLog
index 8695c22..884c609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8695c22..884c609 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jun 30 13:18:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gstrfuncs.c glib/gstring.h: Try compiling
+       before committing, why don't you? Simple fixes
+       for my stupid typos. 
+
 Sat Jun 30 12:49:26 2001  Owen Taylor  <otaylor@redhat.com>
 
         Patch from Darin Adler (#54166)

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index de6760e..0db804b 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1000,7 +1000,7 @@ g_ascii_strdown (gchar *string)
 gchar*
 g_ascii_strup (gchar *string)
 {
-  gchar *s;
+  gchar *result, *s;
 
   g_return_val_if_fail (string != NULL, NULL);
 
@@ -1094,7 +1094,7 @@ g_strreverse (gchar *string)
 gboolean
 g_ascii_isalpha (gchar c)
 {
-  return g_ascii_is_lower (c) || g_ascii_is_upper (c);
+  return g_ascii_islower (c) || g_ascii_isupper (c);
 }
 
 /**
@@ -1115,7 +1115,7 @@ g_ascii_isalpha (gchar c)
 gboolean
 g_ascii_isalnum (gchar c)
 {
-  return g_ascii_is_alpha (c) || isdigit (c);
+  return g_ascii_isalpha (c) || isdigit (c);
 }
 
 

diff --git a/glib/gstring.h b/glib/gstring.h
index fe42491..fbdee1d 100644 (file)
--- a/glib/gstring.h
+++ b/glib/gstring.h
@@ -106,8 +106,6 @@ void         g_string_printfa           (GString     *string,
 
 #ifndef G_DISABLE_DEPRECATED
 
-#ifndef G_DISABLE_DEPRECATED
-
 /* The following two functions are deprecated and will be removed in
  * the next major release. They use the locale-specific tolower and
  * toupper, which is almost never the right thing.