projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GVariant: fix a trivial typo in a comment
[platform/upstream/glib.git]
/
glib
/
gstring.h
diff --git
a/glib/gstring.h
b/glib/gstring.h
index
fc79ae3
..
c8d5b8a
100644
(file)
--- a/
glib/gstring.h
+++ b/
glib/gstring.h
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
/*
*/
/*
@@
-24,15
+22,16
@@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
#ifndef __G_STRING_H__
#define __G_STRING_H__
#ifndef __G_STRING_H__
#define __G_STRING_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
#include <glib/gtypes.h>
#include <glib/gunicode.h>
#include <glib/gtypes.h>
#include <glib/gunicode.h>
+#include <glib/gbytes.h>
#include <glib/gutils.h> /* for G_CAN_INLINE */
G_BEGIN_DECLS
#include <glib/gutils.h> /* for G_CAN_INLINE */
G_BEGIN_DECLS
@@
-46,76
+45,111
@@
struct _GString
gsize allocated_len;
};
gsize allocated_len;
};
+GLIB_AVAILABLE_IN_ALL
GString* g_string_new (const gchar *init);
GString* g_string_new (const gchar *init);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_new_len (const gchar *init,
gssize len);
GString* g_string_new_len (const gchar *init,
gssize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_sized_new (gsize dfl_size);
GString* g_string_sized_new (gsize dfl_size);
+GLIB_AVAILABLE_IN_ALL
gchar* g_string_free (GString *string,
gboolean free_segment);
gchar* g_string_free (GString *string,
gboolean free_segment);
+GLIB_AVAILABLE_IN_2_34
+GBytes* g_string_free_to_bytes (GString *string);
+GLIB_AVAILABLE_IN_ALL
gboolean g_string_equal (const GString *v,
const GString *v2);
gboolean g_string_equal (const GString *v,
const GString *v2);
+GLIB_AVAILABLE_IN_ALL
guint g_string_hash (const GString *str);
guint g_string_hash (const GString *str);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_assign (GString *string,
const gchar *rval);
GString* g_string_assign (GString *string,
const gchar *rval);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_truncate (GString *string,
gsize len);
GString* g_string_truncate (GString *string,
gsize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_set_size (GString *string,
gsize len);
GString* g_string_set_size (GString *string,
gsize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_insert_len (GString *string,
gssize pos,
const gchar *val,
gssize len);
GString* g_string_insert_len (GString *string,
gssize pos,
const gchar *val,
gssize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_append (GString *string,
const gchar *val);
GString* g_string_append (GString *string,
const gchar *val);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_append_len (GString *string,
const gchar *val,
gssize len);
GString* g_string_append_len (GString *string,
const gchar *val,
gssize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_append_c (GString *string,
gchar c);
GString* g_string_append_c (GString *string,
gchar c);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_append_unichar (GString *string,
gunichar wc);
GString* g_string_append_unichar (GString *string,
gunichar wc);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_prepend (GString *string,
const gchar *val);
GString* g_string_prepend (GString *string,
const gchar *val);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_prepend_c (GString *string,
gchar c);
GString* g_string_prepend_c (GString *string,
gchar c);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_prepend_unichar (GString *string,
gunichar wc);
GString* g_string_prepend_unichar (GString *string,
gunichar wc);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_prepend_len (GString *string,
const gchar *val,
gssize len);
GString* g_string_prepend_len (GString *string,
const gchar *val,
gssize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_insert (GString *string,
gssize pos,
const gchar *val);
GString* g_string_insert (GString *string,
gssize pos,
const gchar *val);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_insert_c (GString *string,
gssize pos,
gchar c);
GString* g_string_insert_c (GString *string,
gssize pos,
gchar c);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_insert_unichar (GString *string,
gssize pos,
gunichar wc);
GString* g_string_insert_unichar (GString *string,
gssize pos,
gunichar wc);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_overwrite (GString *string,
gsize pos,
const gchar *val);
GString* g_string_overwrite (GString *string,
gsize pos,
const gchar *val);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_overwrite_len (GString *string,
gsize pos,
const gchar *val,
gssize len);
GString* g_string_overwrite_len (GString *string,
gsize pos,
const gchar *val,
gssize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_erase (GString *string,
gssize pos,
gssize len);
GString* g_string_erase (GString *string,
gssize pos,
gssize len);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_ascii_down (GString *string);
GString* g_string_ascii_down (GString *string);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_ascii_up (GString *string);
GString* g_string_ascii_up (GString *string);
+GLIB_AVAILABLE_IN_ALL
void g_string_vprintf (GString *string,
const gchar *format,
void g_string_vprintf (GString *string,
const gchar *format,
- va_list args);
+ va_list args)
+ G_GNUC_PRINTF(2, 0);
+GLIB_AVAILABLE_IN_ALL
void g_string_printf (GString *string,
const gchar *format,
...) G_GNUC_PRINTF (2, 3);
void g_string_printf (GString *string,
const gchar *format,
...) G_GNUC_PRINTF (2, 3);
+GLIB_AVAILABLE_IN_ALL
void g_string_append_vprintf (GString *string,
const gchar *format,
void g_string_append_vprintf (GString *string,
const gchar *format,
- va_list args);
+ va_list args)
+ G_GNUC_PRINTF(2, 0);
+GLIB_AVAILABLE_IN_ALL
void g_string_append_printf (GString *string,
const gchar *format,
...) G_GNUC_PRINTF (2, 3);
void g_string_append_printf (GString *string,
const gchar *format,
...) G_GNUC_PRINTF (2, 3);
+GLIB_AVAILABLE_IN_ALL
GString* g_string_append_uri_escaped (GString *string,
const gchar *unescaped,
const gchar *reserved_chars_allowed,
GString* g_string_append_uri_escaped (GString *string,
const gchar *unescaped,
const gchar *reserved_chars_allowed,
@@
-140,15
+174,15
@@
g_string_append_c_inline (GString *gstring,
#endif /* G_CAN_INLINE */
#endif /* G_CAN_INLINE */
-
#ifndef G_DISABLE
_DEPRECATED
-
-G
String *g_string_down (GString *string) G_GNUC_DEPRECATED;
-GString *g_string_up (GString *string)
G_GNUC_DEPRECATED
;
+
GLIB
_DEPRECATED
+GString *g_string_down (GString *string);
+G
LIB_DEPRECATED
+GString *g_string_up (GString *string);
+#ifndef G_DISABLE_DEPRECATED
#define g_string_sprintf g_string_printf
#define g_string_sprintfa g_string_append_printf
#define g_string_sprintf g_string_printf
#define g_string_sprintfa g_string_append_printf
-
-#endif /* G_DISABLE_DEPRECATED */
+#endif
G_END_DECLS
G_END_DECLS