[evolution-data-server] M!22 - Ignore the return value of g_string_append()
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] M!22 - Ignore the return value of g_string_append()
- Date: Fri, 12 Jul 2019 08:58:34 +0000 (UTC)
commit 5e89586230e91b66f7610c316d05e2f12e78341a
Author: Дилян Палаузов <git-dpa aegee org>
Date: Sun Jul 7 16:55:24 2019 +0000
M!22 - Ignore the return value of g_string_append()
Calling “x = g_string_append (x, y)” is equivalent to
“g_string (x, y)”. Or take it into account, when this leads
to shorter code.
Likewise for g_string_append_unichar().
Use the return value fo g_string_append(), when this makes
the code sherter.
In camel_content_disposition_format: skip a realloc() call.
In camel-sasl-ntlm.c: skip a g_string_append_len() call.
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/22
src/addressbook/libebook-contacts/e-name-western.c | 6 +--
.../libedata-book/e-book-backend-sqlitedb.c | 3 +-
src/calendar/libecal/e-cal-system-timezone.c | 2 +-
src/calendar/libecal/e-cal-util.c | 4 +-
src/camel/camel-mime-utils.c | 58 ++++++++++------------
src/camel/camel-sasl-ntlm.c | 6 +--
tests/libebook/vcard/dump-vcard.c | 2 +-
7 files changed, 36 insertions(+), 45 deletions(-)
---
diff --git a/src/addressbook/libebook-contacts/e-name-western.c
b/src/addressbook/libebook-contacts/e-name-western.c
index 2ca337d03..3a0c3673c 100644
--- a/src/addressbook/libebook-contacts/e-name-western.c
+++ b/src/addressbook/libebook-contacts/e-name-western.c
@@ -109,7 +109,7 @@ e_name_western_get_words_at_idx (gchar *str,
p = str + idx;
while (word_count < num_words && *p != '\0') {
while (!g_unichar_isspace (g_utf8_get_char (p)) && *p != '\0') {
- words = g_string_append_unichar (words, g_utf8_get_char (p));
+ g_string_append_unichar (words, g_utf8_get_char (p));
p = g_utf8_next_char (p);
}
@@ -426,7 +426,7 @@ e_name_western_extract_nickname (ENameWestern *name,
nick = g_utf8_next_char (nick);
while (*nick != '\"' && *nick != '\0') {
- str = g_string_append_unichar (str, g_utf8_get_char (nick));
+ g_string_append_unichar (str, g_utf8_get_char (nick));
nick = g_utf8_next_char (nick);
}
@@ -434,7 +434,7 @@ e_name_western_extract_nickname (ENameWestern *name,
g_string_free (str, TRUE);
return;
}
- str = g_string_append_c (str, '\"');
+ g_string_append_c (str, '\"');
name->nick = g_string_free (str, FALSE);
diff --git a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
index d5a56dba1..3f59a0daa 100644
--- a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -1339,8 +1339,7 @@ ixphone_str (gint country_code,
{
GString *const str = g_string_sized_new (6 + national_len);
g_string_append_printf (str, "+%d|", country_code);
- g_string_append_len (str, national_str, national_len);
- return str;
+ return g_string_append_len (str, national_str, national_len);
}
static gint
diff --git a/src/calendar/libecal/e-cal-system-timezone.c b/src/calendar/libecal/e-cal-system-timezone.c
index 09da13973..6fe12dbd7 100644
--- a/src/calendar/libecal/e-cal-system-timezone.c
+++ b/src/calendar/libecal/e-cal-system-timezone.c
@@ -118,7 +118,7 @@ system_timezone_read_etc_timezone (GHashTable *ical_zones)
c = fgetc (etc_timezone);
/* only get the first line, we'll validate the value later */
while (c != EOF && !g_ascii_isspace (c)) {
- reading = g_string_append_c (reading, c);
+ g_string_append_c (reading, c);
c = fgetc (etc_timezone);
}
diff --git a/src/calendar/libecal/e-cal-util.c b/src/calendar/libecal/e-cal-util.c
index 2a91f7e46..09f47efeb 100644
--- a/src/calendar/libecal/e-cal-util.c
+++ b/src/calendar/libecal/e-cal-util.c
@@ -152,7 +152,7 @@ read_line (const gchar *string)
if (!line_str)
line_str = g_string_new ("");
- line_str = g_string_append_c (line_str, *string);
+ g_string_append_c (line_str, *string);
if (*string == '\n')
break;
}
@@ -195,7 +195,7 @@ e_cal_util_parse_ics_string (const gchar *string)
if (!comp_str)
comp_str = g_string_new (line);
else
- comp_str = g_string_append (comp_str, line);
+ g_string_append (comp_str, line);
if (strncmp (line, "END:VCALENDAR", 13) == 0) {
ICalComponent *tmp;
diff --git a/src/camel/camel-mime-utils.c b/src/camel/camel-mime-utils.c
index a3252efd8..9e09f386f 100644
--- a/src/camel/camel-mime-utils.c
+++ b/src/camel/camel-mime-utils.c
@@ -1273,10 +1273,10 @@ append_latin1 (GString *out,
c = (guint) * in++;
len--;
if (c & 0x80) {
- out = g_string_append_c (out, 0xc0 | ((c >> 6) & 0x3)); /* 110000xx */
- out = g_string_append_c (out, 0x80 | (c & 0x3f)); /* 10xxxxxx */
+ g_string_append_c (out, 0xc0 | ((c >> 6) & 0x3)); /* 110000xx */
+ g_string_append_c (out, 0x80 | (c & 0x3f)); /* 10xxxxxx */
} else {
- out = g_string_append_c (out, c);
+ g_string_append_c (out, c);
}
}
return out;
@@ -1977,12 +1977,12 @@ camel_header_encode_phrase (const guchar *in)
if (last_word && !(last_word->type == WORD_2047 && word->type == WORD_2047)) {
/* one or both of the words are not encoded so we write the spaces out untouched */
len = word->start - last_word->end;
- out = g_string_append_len (out, (gchar *) last_word->end, len);
+ g_string_append_len (out, (gchar *) last_word->end, len);
}
switch (word->type) {
case WORD_ATOM:
- out = g_string_append_len (out, (gchar *) word->start, word->end - word->start);
+ g_string_append_len (out, (gchar *) word->start, word->end - word->start);
break;
case WORD_QSTRING:
quote_word (out, TRUE, (gchar *) word->start, word->end - word->start);
@@ -2554,15 +2554,15 @@ header_decode_domain (const gchar **in)
header_decode_lwsp (&inptr);
while (go) {
if (*inptr == '[') { /* domain literal */
- domain = g_string_append_c (domain, '[');
+ g_string_append_c (domain, '[');
inptr++;
header_decode_lwsp (&inptr);
while (*inptr && camel_mime_is_dtext (*inptr)) {
- domain = g_string_append_c (domain, *inptr);
+ g_string_append_c (domain, *inptr);
inptr++;
}
if (*inptr == ']') {
- domain = g_string_append_c (domain, ']');
+ g_string_append_c (domain, ']');
inptr++;
} else {
w (g_warning ("closing ']' not found in domain: %s", *in));
@@ -2570,7 +2570,7 @@ header_decode_domain (const gchar **in)
} else {
gchar *a = header_decode_atom (&inptr);
if (a) {
- domain = g_string_append (domain, a);
+ g_string_append (domain, a);
g_free (a);
} else {
w (g_warning ("missing atom from domain-ref"));
@@ -2579,7 +2579,7 @@ header_decode_domain (const gchar **in)
}
header_decode_lwsp (&inptr);
if (*inptr == '.') { /* next sub-domain? */
- domain = g_string_append_c (domain, '.');
+ g_string_append_c (domain, '.');
inptr++;
header_decode_lwsp (&inptr);
} else
@@ -2603,15 +2603,15 @@ header_decode_addrspec (const gchar **in)
/* addr-spec */
word = header_decode_word (&inptr);
if (word) {
- addr = g_string_append (addr, word);
+ g_string_append (addr, word);
header_decode_lwsp (&inptr);
g_free (word);
while (*inptr == '.' && word) {
inptr++;
- addr = g_string_append_c (addr, '.');
+ g_string_append_c (addr, '.');
word = header_decode_word (&inptr);
if (word) {
- addr = g_string_append (addr, word);
+ g_string_append (addr, word);
header_decode_lwsp (&inptr);
g_free (word);
} else {
@@ -2620,10 +2620,10 @@ header_decode_addrspec (const gchar **in)
}
if (*inptr == '@') {
inptr++;
- addr = g_string_append_c (addr, '@');
+ g_string_append_c (addr, '@');
word = header_decode_domain (&inptr);
if (word) {
- addr = g_string_append (addr, word);
+ g_string_append (addr, word);
g_free (word);
} else {
w (g_warning ("Invalid address, missing domain: %s", *in));
@@ -2698,14 +2698,14 @@ header_decode_mailbox (const gchar **in,
&& (p > 6 && pre[0] == '=' && pre[1] == '?')) {
/* dont append ' ' */
} else {
- name = g_string_append_c (name, ' ');
+ g_string_append_c (name, ' ');
}
} else {
/* Fix for stupidly-broken-mailers that like to put '.''s in names unquoted */
/* see bug #8147 */
while (!pre && *inptr && *inptr != '<') {
w (g_warning ("Working around stupid mailer bug #5: unescaped
characters in names"));
- name = g_string_append_c (name, *inptr++);
+ g_string_append_c (name, *inptr++);
pre = header_decode_word (&inptr);
}
}
@@ -2741,7 +2741,7 @@ header_decode_mailbox (const gchar **in,
}
if (pre) {
- addr = g_string_append (addr, pre);
+ g_string_append (addr, pre);
} else {
w (g_warning ("No local-part for email address: %s", *in));
}
@@ -2751,9 +2751,9 @@ header_decode_mailbox (const gchar **in,
inptr++;
g_free (pre);
pre = header_decode_word (&inptr);
- addr = g_string_append_c (addr, '.');
+ g_string_append_c (addr, '.');
if (pre)
- addr = g_string_append (addr, pre);
+ g_string_append (addr, pre);
comment = inptr;
header_decode_lwsp (&inptr);
}
@@ -2764,10 +2764,10 @@ header_decode_mailbox (const gchar **in,
gchar *dom;
inptr++;
- addr = g_string_append_c (addr, '@');
+ g_string_append_c (addr, '@');
comment = inptr;
dom = header_decode_domain (&inptr);
- addr = g_string_append (addr, dom);
+ g_string_append (addr, dom);
g_free (dom);
} else if (*inptr != '>' || !closeme) {
/* If we get a <, the address was probably a name part, lets try again shall we? */
@@ -2965,8 +2965,8 @@ header_decode_address (const gchar **in,
/* pre-scan, trying to work out format, discard results */
header_decode_lwsp (&inptr);
while ((pre = header_decode_word (&inptr))) {
- group = g_string_append (group, pre);
- group = g_string_append_c (group, ' ');
+ g_string_append (group, pre);
+ g_string_append_c (group, ' ');
g_free (pre);
}
header_decode_lwsp (&inptr);
@@ -3608,11 +3608,11 @@ camel_header_param_list_format_append (GString *out,
/* do not fold file names */
if (!is_filename && used + nlen + vlen > CAMEL_FOLD_SIZE - 8) {
- out = g_string_append (out, ";\n\t");
+ g_string_append (out, ";\n\t");
here = out->len;
used = 0;
} else
- out = g_string_append (out, "; ");
+ g_string_append (out, "; ");
if (!is_filename && nlen + vlen > CAMEL_FOLD_SIZE - 8) {
/* we need to do special rfc2184 parameter wrapping */
@@ -3856,11 +3856,7 @@ camel_content_disposition_format (CamelContentDisposition *d)
if (d == NULL)
return NULL;
- out = g_string_new ("");
- if (d->disposition)
- out = g_string_append (out, d->disposition);
- else
- out = g_string_append (out, "attachment");
+ out = g_string_new (d->disposition ? d->disposition : "attachment");
camel_header_param_list_format_append (out, d->params);
return g_string_free (out, FALSE);
diff --git a/src/camel/camel-sasl-ntlm.c b/src/camel/camel-sasl-ntlm.c
index 4ee5a7dc4..8dae6a0dc 100644
--- a/src/camel/camel-sasl-ntlm.c
+++ b/src/camel/camel-sasl-ntlm.c
@@ -81,7 +81,6 @@ ntlm_get_string (GByteArray *ba,
gint offset)
{
SecurityBuffer *secbuf;
- GString *string;
gchar *buf_string;
guint16 buf_length;
guint32 buf_offset;
@@ -93,11 +92,8 @@ ntlm_get_string (GByteArray *ba,
if (ba->len < buf_offset + buf_length)
return NULL;
- string = g_string_sized_new (buf_length);
buf_string = (gchar *) &ba->data[buf_offset];
- g_string_append_len (string, buf_string, buf_length);
-
- return string;
+ return g_string_new_len (buf_string, buf_length);
}
static void
diff --git a/tests/libebook/vcard/dump-vcard.c b/tests/libebook/vcard/dump-vcard.c
index ad6f58305..ac492c3b8 100644
--- a/tests/libebook/vcard/dump-vcard.c
+++ b/tests/libebook/vcard/dump-vcard.c
@@ -40,7 +40,7 @@ main (gint argc,
while (!feof (fp)) {
gchar buf[1024];
if (fgets (buf, sizeof (buf), fp))
- str = g_string_append (str, buf);
+ g_string_append (str, buf);
}
fclose (fp);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
