diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-06-15 10:05:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-06-16 19:18:57 +0200 |
| commit | c8e79533337b817bbb049914de272dcc7034669d (patch) | |
| tree | 2ccbde833d4b9bbd6c94fcb3ebb96d7518c9872f /callouts | |
| parent | afecbf1f661a775f6164c469f392f549483ffe52 (diff) | |
dispatcher/trivial: rename variables for script directory to NMD_SCRIPT_DIR_*
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/nm-dispatcher-api.h | 6 | ||||
| -rw-r--r-- | callouts/nm-dispatcher.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/callouts/nm-dispatcher-api.h b/callouts/nm-dispatcher-api.h index eb6b33fe0c..03e40f7752 100644 --- a/callouts/nm-dispatcher-api.h +++ b/callouts/nm-dispatcher-api.h @@ -20,9 +20,9 @@ #include <dbus/dbus-glib.h> -#define NMD_SCRIPT_DIR NMCONFDIR "/dispatcher.d" -#define NMD_PRE_UP_DIR NMD_SCRIPT_DIR "/pre-up.d" -#define NMD_PRE_DOWN_DIR NMD_SCRIPT_DIR "/pre-down.d" +#define NMD_SCRIPT_DIR_DEFAULT NMCONFDIR "/dispatcher.d" +#define NMD_SCRIPT_DIR_PRE_UP NMD_SCRIPT_DIR_DEFAULT "/pre-up.d" +#define NMD_SCRIPT_DIR_PRE_DOWN NMD_SCRIPT_DIR_DEFAULT "/pre-down.d" /* dbus-glib types for dispatcher call return value */ #define DISPATCHER_TYPE_RESULT (dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID)) diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index 93998225d1..680715d1cd 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -426,12 +426,12 @@ find_scripts (const char *str_action) if ( strcmp (str_action, NMD_ACTION_PRE_UP) == 0 || strcmp (str_action, NMD_ACTION_VPN_PRE_UP) == 0) - dirname = NMD_PRE_UP_DIR; + dirname = NMD_SCRIPT_DIR_PRE_UP; else if ( strcmp (str_action, NMD_ACTION_PRE_DOWN) == 0 || strcmp (str_action, NMD_ACTION_VPN_PRE_DOWN) == 0) - dirname = NMD_PRE_DOWN_DIR; + dirname = NMD_SCRIPT_DIR_PRE_DOWN; else - dirname = NMD_SCRIPT_DIR; + dirname = NMD_SCRIPT_DIR_DEFAULT; if (!(dir = g_dir_open (dirname, 0, &error))) { g_message ("Failed to open dispatcher directory '%s': (%d) %s", |