diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
| commit | c2de0d98ba39e0a1a970d066fd19be786092f376 (patch) | |
| tree | 3838363c06a6019db6cf1f882ea34ebded63c38b /src/settings/plugins/ifcfg-rh/utils.c | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'src/settings/plugins/ifcfg-rh/utils.c')
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/utils.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c index 599e3a49..fda900b2 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/utils.c @@ -18,17 +18,15 @@ * (C) Copyright 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "utils.h" #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" #include "NetworkManagerUtils.h" - -#include "utils.h" #include "shvar.h" /* @@ -214,8 +212,8 @@ utils_get_ifcfg_name (const char *file, gboolean only_ifcfg) #define MATCH_TAG_AND_RETURN(name, TAG) \ G_STMT_START { \ - if (strncmp (name, TAG, STRLEN (TAG)) == 0) { \ - name += STRLEN (TAG); \ + if (strncmp (name, TAG, NM_STRLEN (TAG)) == 0) { \ + name += NM_STRLEN (TAG); \ if (name[0] == '\0') \ return NULL; \ else \ @@ -436,8 +434,8 @@ utils_detect_ifcfg_path (const char *path, gboolean only_ifcfg) base = g_path_get_basename (path); - if (strncmp (base, IFCFG_TAG, STRLEN (IFCFG_TAG)) == 0) { - if (base[STRLEN (IFCFG_TAG)] == '\0') + if (strncmp (base, IFCFG_TAG, NM_STRLEN (IFCFG_TAG)) == 0) { + if (base[NM_STRLEN (IFCFG_TAG)] == '\0') return NULL; if (utils_is_ifcfg_alias_file (base, NULL)) { ifcfg = g_strdup (path); |