diff options
author | Thomas Haller <thaller@redhat.com> | 2018-07-11 07:40:19 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-07-11 12:02:06 +0200 |
commit | e1c7a2b5d0b142a3d4347ec6f1934f53c4b402a9 (patch) | |
tree | f61f41729ed8844d566eb68c69d9550a07564215 /libnm-util/nm-utils.c | |
parent | 7e98b4cad2ff9934d8b5855b291c2baaa7543801 (diff) | |
download | NetworkManager-e1c7a2b5d0b142a3d4347ec6f1934f53c4b402a9.tar.gz |
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
Diffstat (limited to 'libnm-util/nm-utils.c')
-rw-r--r-- | libnm-util/nm-utils.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 2af9432fee..26f5533a28 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -295,8 +295,8 @@ nm_utils_ssid_to_utf8 (const GByteArray *ssid) g_return_val_if_fail (ssid != NULL, NULL); - if (g_utf8_validate ((const gchar *) ssid->data, ssid->len, NULL)) - return g_strndup ((const gchar *) ssid->data, ssid->len); + if (g_utf8_validate ((const char *) ssid->data, ssid->len, NULL)) + return g_strndup ((const char *) ssid->data, ssid->len); /* LANG may be a good encoding hint */ g_get_charset ((const char **)(&e1)); @@ -311,15 +311,15 @@ nm_utils_ssid_to_utf8 (const GByteArray *ssid) g_free (lang); } - converted = g_convert ((const gchar *) ssid->data, ssid->len, "UTF-8", e1, NULL, NULL, NULL); + converted = g_convert ((const char *) ssid->data, ssid->len, "UTF-8", e1, NULL, NULL, NULL); if (!converted && e2) - converted = g_convert ((const gchar *) ssid->data, ssid->len, "UTF-8", e2, NULL, NULL, NULL); + converted = g_convert ((const char *) ssid->data, ssid->len, "UTF-8", e2, NULL, NULL, NULL); if (!converted && e3) - converted = g_convert ((const gchar *) ssid->data, ssid->len, "UTF-8", e3, NULL, NULL, NULL); + converted = g_convert ((const char *) ssid->data, ssid->len, "UTF-8", e3, NULL, NULL, NULL); if (!converted) { - converted = g_convert_with_fallback ((const gchar *) ssid->data, ssid->len, + converted = g_convert_with_fallback ((const char *) ssid->data, ssid->len, "UTF-8", e1, "?", NULL, NULL, NULL); } @@ -330,11 +330,11 @@ nm_utils_ssid_to_utf8 (const GByteArray *ssid) */ /* Use the printable range of 0x20-0x7E */ - gchar *valid_chars = " !\"#$%&'()*+,-./0123456789:;<=>?@" + char *valid_chars = " !\"#$%&'()*+,-./0123456789:;<=>?@" "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`" "abcdefghijklmnopqrstuvwxyz{|}~"; - converted = g_strndup ((const gchar *)ssid->data, ssid->len); + converted = g_strndup ((const char *)ssid->data, ssid->len); g_strcanon (converted, valid_chars, '?'); } |