From a206a29a540236216031dc83ff6470ca526ed92f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 20 Dec 2009 21:11:35 +0200 Subject: [PATCH] dbus: Remove the confusing "ctrl_iface_" prefix from file names The D-Bus interface does not really have anything to do with the wpa_supplicant ctrl_iface interface and as such, this prefix in dbus files is both confusing and unnecessarily. Make the file names shorter by removing this prefix. --- wpa_supplicant/Makefile | 6 +++--- wpa_supplicant/dbus/Makefile | 10 +++++----- wpa_supplicant/dbus/{ctrl_iface_dbus.c => dbus.c} | 8 ++++---- wpa_supplicant/dbus/{ctrl_iface_dbus.h => dbus.h} | 0 ...{ctrl_iface_dbus_handlers.c => dbus_handlers.c} | 14 +++++++------- ...{ctrl_iface_dbus_handlers.h => dbus_handlers.h} | 0 wpa_supplicant/dbus/dbus_handlers_wps.c | 4 ++-- .../dbus/{ctrl_iface_dbus_new.c => dbus_new.c} | 10 +++++----- .../dbus/{ctrl_iface_dbus_new.h => dbus_new.h} | 0 ...ace_dbus_new_handlers.c => dbus_new_handlers.c} | 14 +++++++------- ...ace_dbus_new_handlers.h => dbus_new_handlers.h} | 0 wpa_supplicant/dbus/dbus_new_handlers_wps.c | 6 +++--- ...iface_dbus_new_helpers.c => dbus_new_helpers.c} | 2 +- ...iface_dbus_new_helpers.h => dbus_new_helpers.h} | 0 14 files changed, 37 insertions(+), 37 deletions(-) rename wpa_supplicant/dbus/{ctrl_iface_dbus.c => dbus.c} (99%) rename wpa_supplicant/dbus/{ctrl_iface_dbus.h => dbus.h} (100%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_handlers.c => dbus_handlers.c} (99%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_handlers.h => dbus_handlers.h} (100%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_new.c => dbus_new.c} (99%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_new.h => dbus_new.h} (100%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_new_handlers.c => dbus_new_handlers.c} (99%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_new_handlers.h => dbus_new_handlers.h} (100%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_new_helpers.c => dbus_new_helpers.c} (99%) rename wpa_supplicant/dbus/{ctrl_iface_dbus_new_helpers.h => dbus_new_helpers.h} (100%) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 0225bc183..783cbd9b8 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -1028,7 +1028,7 @@ endif ifdef CONFIG_CTRL_IFACE_DBUS DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE -DBUS_OBJS += dbus/ctrl_iface_dbus.o dbus/ctrl_iface_dbus_handlers.o +DBUS_OBJS += dbus/dbus.o dbus/dbus_handlers.o ifdef CONFIG_WPS DBUS_OBJS += dbus/dbus_handlers_wps.o endif @@ -1056,8 +1056,8 @@ endif ifdef CONFIG_CTRL_IFACE_DBUS_NEW DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_NEW DBUS_OBJS ?= dbus/dbus_dict_helpers.o -DBUS_OBJS += dbus/ctrl_iface_dbus_new_helpers.o -DBUS_OBJS += dbus/ctrl_iface_dbus_new.o dbus/ctrl_iface_dbus_new_handlers.o +DBUS_OBJS += dbus/dbus_new_helpers.o +DBUS_OBJS += dbus/dbus_new.o dbus/dbus_new_handlers.o ifdef CONFIG_WPS DBUS_OBJS += dbus/dbus_new_handlers_wps.o endif diff --git a/wpa_supplicant/dbus/Makefile b/wpa_supplicant/dbus/Makefile index bd615ca36..b4f269abc 100644 --- a/wpa_supplicant/dbus/Makefile +++ b/wpa_supplicant/dbus/Makefile @@ -64,11 +64,11 @@ DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR) CFLAGS += $(DBUS_INCLUDE) LIB_OBJS= \ - ctrl_iface_dbus.o \ - ctrl_iface_dbus_handlers.o \ - ctrl_iface_dbus_new.o \ - ctrl_iface_dbus_new_handlers.o \ - ctrl_iface_dbus_new_helpers.o \ + dbus.o \ + dbus_handlers.o \ + dbus_new.o \ + dbus_new_handlers.o \ + dbus_new_helpers.o \ dbus_dict_helpers.o ifdef CONFIG_WPS diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus.c b/wpa_supplicant/dbus/dbus.c similarity index 99% rename from wpa_supplicant/dbus/ctrl_iface_dbus.c rename to wpa_supplicant/dbus/dbus.c index 000f779a8..2bf9df558 100644 --- a/wpa_supplicant/dbus/ctrl_iface_dbus.c +++ b/wpa_supplicant/dbus/dbus.c @@ -16,12 +16,12 @@ #include "common.h" #include "eloop.h" -#include "../config.h" -#include "../wpa_supplicant_i.h" #include "drivers/driver.h" #include "wps/wps.h" -#include "ctrl_iface_dbus.h" -#include "ctrl_iface_dbus_handlers.h" +#include "../config.h" +#include "../wpa_supplicant_i.h" +#include "dbus.h" +#include "dbus_handlers.h" #define _DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR) #define DBUS_VER(major, minor) ((major) << 8 | (minor)) diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus.h b/wpa_supplicant/dbus/dbus.h similarity index 100% rename from wpa_supplicant/dbus/ctrl_iface_dbus.h rename to wpa_supplicant/dbus/dbus.h diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_handlers.c b/wpa_supplicant/dbus/dbus_handlers.c similarity index 99% rename from wpa_supplicant/dbus/ctrl_iface_dbus_handlers.c rename to wpa_supplicant/dbus/dbus_handlers.c index 31cf7aef2..a0d197ad4 100644 --- a/wpa_supplicant/dbus/ctrl_iface_dbus_handlers.c +++ b/wpa_supplicant/dbus/dbus_handlers.c @@ -15,18 +15,18 @@ #include "includes.h" #include "common.h" +#include "eap_peer/eap_methods.h" +#include "common/ieee802_11_defs.h" +#include "eapol_supp/eapol_supp_sm.h" +#include "rsn_supp/wpa.h" #include "../config.h" #include "../wpa_supplicant_i.h" #include "../driver_i.h" -#include "ctrl_iface_dbus.h" -#include "ctrl_iface_dbus_handlers.h" #include "../notify.h" -#include "eap_peer/eap_methods.h" -#include "dbus_dict_helpers.h" -#include "common/ieee802_11_defs.h" #include "../wpas_glue.h" -#include "eapol_supp/eapol_supp_sm.h" -#include "rsn_supp/wpa.h" +#include "dbus.h" +#include "dbus_handlers.h" +#include "dbus_dict_helpers.h" extern int wpa_debug_level; extern int wpa_debug_show_keys; diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_handlers.h b/wpa_supplicant/dbus/dbus_handlers.h similarity index 100% rename from wpa_supplicant/dbus/ctrl_iface_dbus_handlers.h rename to wpa_supplicant/dbus/dbus_handlers.h diff --git a/wpa_supplicant/dbus/dbus_handlers_wps.c b/wpa_supplicant/dbus/dbus_handlers_wps.c index ba8b3a9fb..42bed1cc7 100644 --- a/wpa_supplicant/dbus/dbus_handlers_wps.c +++ b/wpa_supplicant/dbus/dbus_handlers_wps.c @@ -18,8 +18,8 @@ #include "../config.h" #include "../wpa_supplicant_i.h" #include "../wps_supplicant.h" -#include "ctrl_iface_dbus.h" -#include "ctrl_iface_dbus_handlers.h" +#include "dbus.h" +#include "dbus_handlers.h" /** * wpas_dbus_iface_wps_pbc - Request credentials using WPS PBC method diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_new.c b/wpa_supplicant/dbus/dbus_new.c similarity index 99% rename from wpa_supplicant/dbus/ctrl_iface_dbus_new.c rename to wpa_supplicant/dbus/dbus_new.c index 881c1ce12..d05fec5ea 100644 --- a/wpa_supplicant/dbus/ctrl_iface_dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -16,14 +16,14 @@ #include "includes.h" #include "common.h" -#include "../config.h" -#include "../wpa_supplicant_i.h" #include "drivers/driver.h" #include "wps/wps.h" -#include "ctrl_iface_dbus_new_helpers.h" +#include "../config.h" +#include "../wpa_supplicant_i.h" +#include "dbus_new_helpers.h" #include "dbus_dict_helpers.h" -#include "ctrl_iface_dbus_new.h" -#include "ctrl_iface_dbus_new_handlers.h" +#include "dbus_new.h" +#include "dbus_new_handlers.h" /** * wpas_dbus_set_path - Assign a dbus path to an interface diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_new.h b/wpa_supplicant/dbus/dbus_new.h similarity index 100% rename from wpa_supplicant/dbus/ctrl_iface_dbus_new.h rename to wpa_supplicant/dbus/dbus_new.h diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c similarity index 99% rename from wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.c rename to wpa_supplicant/dbus/dbus_new_handlers.c index 18e750003..e43ca6c14 100644 --- a/wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -16,18 +16,18 @@ #include "includes.h" #include "common.h" +#include "common/ieee802_11_defs.h" +#include "eap_peer/eap_methods.h" +#include "eapol_supp/eapol_supp_sm.h" #include "../config.h" #include "../wpa_supplicant_i.h" #include "../driver_i.h" -#include "ctrl_iface_dbus_new_helpers.h" -#include "ctrl_iface_dbus_new.h" -#include "ctrl_iface_dbus_new_handlers.h" #include "../notify.h" -#include "eap_peer/eap_methods.h" -#include "dbus_dict_helpers.h" -#include "common/ieee802_11_defs.h" #include "../wpas_glue.h" -#include "eapol_supp/eapol_supp_sm.h" +#include "dbus_new_helpers.h" +#include "dbus_new.h" +#include "dbus_new_handlers.h" +#include "dbus_dict_helpers.h" extern int wpa_debug_level; extern int wpa_debug_show_keys; diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h similarity index 100% rename from wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.h rename to wpa_supplicant/dbus/dbus_new_handlers.h diff --git a/wpa_supplicant/dbus/dbus_new_handlers_wps.c b/wpa_supplicant/dbus/dbus_new_handlers_wps.c index f8b019f00..5f3581e7a 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers_wps.c +++ b/wpa_supplicant/dbus/dbus_new_handlers_wps.c @@ -19,9 +19,9 @@ #include "../config.h" #include "../wpa_supplicant_i.h" #include "../wps_supplicant.h" -#include "ctrl_iface_dbus_new_helpers.h" -#include "ctrl_iface_dbus_new.h" -#include "ctrl_iface_dbus_new_handlers.h" +#include "dbus_new_helpers.h" +#include "dbus_new.h" +#include "dbus_new_handlers.h" #include "dbus_dict_helpers.h" /** diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c similarity index 99% rename from wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.c rename to wpa_supplicant/dbus/dbus_new_helpers.c index d2da61594..d57e54908 100644 --- a/wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.c +++ b/wpa_supplicant/dbus/dbus_new_helpers.c @@ -17,7 +17,7 @@ #include "common.h" #include "eloop.h" -#include "ctrl_iface_dbus_new_helpers.h" +#include "dbus_new_helpers.h" /** * struct wpa_dbus_method_desc - DBus method description diff --git a/wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.h b/wpa_supplicant/dbus/dbus_new_helpers.h similarity index 100% rename from wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.h rename to wpa_supplicant/dbus/dbus_new_helpers.h