diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /src/nm-config.c | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'src/nm-config.c')
| -rw-r--r-- | src/nm-config.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/nm-config.c b/src/nm-config.c index 15ef886b..58fd96cb 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -19,12 +19,11 @@ * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdio.h> -#include "nm-default.h" #include "nm-config.h" #include "nm-utils.h" #include "nm-device.h" @@ -117,7 +116,7 @@ static void _set_config_data (NMConfig *self, NMConfigData *new_data, int signal #define _HAS_PREFIX(str, prefix) \ ({ \ const char *_str = (str); \ - g_str_has_prefix ( _str, ""prefix"") && _str[STRLEN(prefix)] != '\0'; \ + g_str_has_prefix ( _str, ""prefix"") && _str[NM_STRLEN(prefix)] != '\0'; \ }) /************************************************************************/ @@ -1188,7 +1187,7 @@ intern_config_read (const char *filename, continue; g_key_file_set_value (keyfile_intern, group, key, value_set); } else if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) { - const char *key_base = &key[STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_SET)]; + const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_SET)]; gs_free char *value_was = NULL; gs_free char *value_conf = NULL; gs_free char *key_was = g_strdup_printf (NM_CONFIG_KEYFILE_KEYPREFIX_WAS"%s", key_base); @@ -1208,7 +1207,7 @@ intern_config_read (const char *filename, has_intern = TRUE; g_key_file_set_value (keyfile_intern, group, key_base, value_set); } else if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) { - const char *key_base = &key[STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)]; + const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)]; gs_free char *key_set = g_strdup_printf (NM_CONFIG_KEYFILE_KEYPREFIX_SET"%s", key_base); gs_free char *value_was = NULL; gs_free char *value_conf = NULL; @@ -1252,7 +1251,7 @@ out: needs_rewrite = TRUE; for (g = 0; groups && groups[g]; g++) { if ( g_str_has_prefix (groups[g], NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN) - && groups[g][STRLEN (NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN)]) { + && groups[g][NM_STRLEN (NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN)]) { g_key_file_remove_group (keyfile_intern, groups[g], NULL); needs_rewrite = TRUE; } @@ -1391,7 +1390,7 @@ intern_config_write (const char *filename, * Why did this happen?? */ g_warn_if_reached (); } else if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) { - const char *key_base = &key[STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)]; + const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)]; if ( _HAS_PREFIX (key_base, NM_CONFIG_KEYFILE_KEYPREFIX_SET) || _HAS_PREFIX (key_base, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) { |