Guard against the POSIX allowed behavior where access (file, X_OK)

[platform/upstream/glib.git] / glib / gstring.h

diff --git a/glib/gstring.h b/glib/gstring.h
index 4337f3c..a9127b3 100644 (file)
--- a/glib/gstring.h
+++ b/glib/gstring.h
@@ -28,6 +28,7 @@
 #define __G_STRING_H__
 
 #include <glib/gtypes.h>
+#include <glib/gunicode.h>
 
 G_BEGIN_DECLS
 
@@ -79,10 +80,14 @@ GString*     g_string_append_len        (GString     *string,
                                          gssize           len);  
 GString*     g_string_append_c          (GString        *string,
                                         gchar            c);
+GString*     g_string_append_unichar    (GString        *string,
+                                        gunichar         wc);
 GString*     g_string_prepend           (GString        *string,
                                         const gchar     *val);
 GString*     g_string_prepend_c         (GString        *string,
                                         gchar            c);
+GString*     g_string_prepend_unichar   (GString        *string,
+                                        gunichar         wc);
 GString*     g_string_prepend_len       (GString        *string,
                                         const gchar     *val,
                                          gssize           len);  
@@ -92,20 +97,36 @@ GString*     g_string_insert            (GString     *string,
 GString*     g_string_insert_c          (GString        *string,
                                         gssize           pos,    
                                         gchar            c);
+GString*     g_string_insert_unichar    (GString        *string,
+                                        gssize           pos,    
+                                        gunichar         wc);
 GString*     g_string_erase            (GString         *string,
-                                        gsize            pos,    
-                                        gsize            len);   
-GString*     g_string_down              (GString        *string);
-GString*     g_string_up                (GString        *string);
+                                        gssize           pos,
+                                        gssize           len);
+GString*     g_string_ascii_down        (GString        *string);
+GString*     g_string_ascii_up          (GString        *string);
 void         g_string_printf            (GString        *string,
                                         const gchar     *format,
                                         ...) G_GNUC_PRINTF (2, 3);
-void         g_string_printfa           (GString        *string,
+void         g_string_append_printf     (GString        *string,
                                         const gchar     *format,
                                         ...) G_GNUC_PRINTF (2, 3);
-/* compatibility */
+
+#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.
+ */
+
+GString*     g_string_down              (GString        *string);
+GString*     g_string_up                (GString        *string);
+
+/* These aliases are included for compatibility. */
 #define        g_string_sprintf        g_string_printf
-#define        g_string_sprintfa       g_string_printfa
+#define        g_string_sprintfa       g_string_append_printf
+
+#endif /* G_DISABLE_DEPRECATED */
 
 G_END_DECLS