From c0930e2c719088b854571a0aea3c449ec139be8b Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 19 Feb 2004 17:42:00 +0000 Subject: [PATCH] for G_CAN_INLINE environments, inline g_string_append_c() for efficiency. Thu Feb 19 18:40:01 2004 Tim Janik * glib/gstring.[hc]: for G_CAN_INLINE environments, inline g_string_append_c() for efficiency. (vaguely based on #118707). --- ChangeLog | 5 +++ ChangeLog.pre-2-10 | 5 +++ ChangeLog.pre-2-12 | 5 +++ ChangeLog.pre-2-4 | 5 +++ ChangeLog.pre-2-6 | 5 +++ ChangeLog.pre-2-8 | 5 +++ docs/reference/glib/tmpl/completion.sgml | 11 ++++++ docs/reference/glib/tmpl/main.sgml | 49 ++++++++++++++++++++++++ glib/gstring.c | 1 + glib/gstring.h | 20 ++++++++++ 10 files changed, 111 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2dece30ca..6e0f1b6ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 19 18:40:01 2004 Tim Janik + + * glib/gstring.[hc]: for G_CAN_INLINE environments, inline + g_string_append_c() for efficiency. (vaguely based on #118707). + Wed Feb 18 23:57:42 2004 Matthias Clasen * glib/gmain.c: Include signal.h for SIGCHLD. (#134622, Damien diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2dece30ca..6e0f1b6ce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Feb 19 18:40:01 2004 Tim Janik + + * glib/gstring.[hc]: for G_CAN_INLINE environments, inline + g_string_append_c() for efficiency. (vaguely based on #118707). + Wed Feb 18 23:57:42 2004 Matthias Clasen * glib/gmain.c: Include signal.h for SIGCHLD. (#134622, Damien diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2dece30ca..6e0f1b6ce 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Feb 19 18:40:01 2004 Tim Janik + + * glib/gstring.[hc]: for G_CAN_INLINE environments, inline + g_string_append_c() for efficiency. (vaguely based on #118707). + Wed Feb 18 23:57:42 2004 Matthias Clasen * glib/gmain.c: Include signal.h for SIGCHLD. (#134622, Damien diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2dece30ca..6e0f1b6ce 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Feb 19 18:40:01 2004 Tim Janik + + * glib/gstring.[hc]: for G_CAN_INLINE environments, inline + g_string_append_c() for efficiency. (vaguely based on #118707). + Wed Feb 18 23:57:42 2004 Matthias Clasen * glib/gmain.c: Include signal.h for SIGCHLD. (#134622, Damien diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2dece30ca..6e0f1b6ce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Feb 19 18:40:01 2004 Tim Janik + + * glib/gstring.[hc]: for G_CAN_INLINE environments, inline + g_string_append_c() for efficiency. (vaguely based on #118707). + Wed Feb 18 23:57:42 2004 Matthias Clasen * glib/gmain.c: Include signal.h for SIGCHLD. (#134622, Damien diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2dece30ca..6e0f1b6ce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Feb 19 18:40:01 2004 Tim Janik + + * glib/gstring.[hc]: for G_CAN_INLINE environments, inline + g_string_append_c() for efficiency. (vaguely based on #118707). + Wed Feb 18 23:57:42 2004 Matthias Clasen * glib/gmain.c: Include signal.h for SIGCHLD. (#134622, Damien diff --git a/docs/reference/glib/tmpl/completion.sgml b/docs/reference/glib/tmpl/completion.sgml index 89c09e3cc..20e009fcc 100644 --- a/docs/reference/glib/tmpl/completion.sgml +++ b/docs/reference/glib/tmpl/completion.sgml @@ -107,6 +107,17 @@ This string should be freed when no longer needed. not be changed. + + + + + +@cmp: +@prefix: +@new_prefix: +@Returns: + + Sets the function to use for string comparisons. The default diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml index 5b4ec6f73..a5fe64c3c 100644 --- a/docs/reference/glib/tmpl/main.sgml +++ b/docs/reference/glib/tmpl/main.sgml @@ -585,6 +585,55 @@ for the default main context. @Returns: + + + + + + + + + + + +@pid: +@status: +@data: + + + + + + + +@pid: +@Returns: + + + + + + + +@pid: +@function: +@data: +@Returns: + + + + + + + +@priority: +@pid: +@function: +@data: +@notify: +@Returns: + + diff --git a/glib/gstring.c b/glib/gstring.c index 15c07575c..6a4a9db67 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -515,6 +515,7 @@ g_string_append_len (GString *string, return g_string_insert_len (string, -1, val, len); } +#undef g_string_append_c GString* g_string_append_c (GString *string, gchar c) diff --git a/glib/gstring.h b/glib/gstring.h index e50c6423e..7357291ec 100644 --- a/glib/gstring.h +++ b/glib/gstring.h @@ -29,6 +29,7 @@ #include #include +#include /* for G_CAN_INLINE */ G_BEGIN_DECLS @@ -115,6 +116,25 @@ void g_string_append_printf (GString *string, const gchar *format, ...) G_GNUC_PRINTF (2, 3); +/* -- optimize g_strig_append_c --- */ +#ifdef G_CAN_INLINE +static inline GString* +g_string_append_c_inline (GString *gstring, + gchar c) +{ + if (gstring->len < gstring->allocated_len && 0) + { + gstring->str[gstring->len++] = c; + gstring->str[gstring->len] = 0; + } + else + g_string_insert_c (gstring, -1, c); + return gstring; +} +#define g_string_append_c(gstr,c) g_string_append_c_inline (gstr, c) +#endif /* G_CAN_INLINE */ + + #ifndef G_DISABLE_DEPRECATED /* The following two functions are deprecated and will be removed in