diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2013-11-06 02:24:47 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2013-11-06 03:19:23 +0100 |
| commit | c732b58fb0e0776f456cf0f2e1dcc311a568e4f6 (patch) | |
| tree | 0bd65584a5cbd07b5166e9b01edaa874f67d0713 | |
| parent | ee04e7ef1cd18268a956a4ff3521642b2cfff84e (diff) | |
owfd: move wpa_ctrl.h -> wpa.h
We are going to add some more wpa helpers. Rename the header to better
resemble what it defines. The wpa_ctrl interface will be only one of many.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/p2pd.c | 1 | ||||
| -rw-r--r-- | src/p2pd_interface.c | 2 | ||||
| -rw-r--r-- | src/wpa.h (renamed from src/wpa_ctrl.h) | 6 | ||||
| -rw-r--r-- | src/wpa_ctrl.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 6f78a38..898e08d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,7 +118,7 @@ libowfd_la_SOURCES = \ src/rtsp_tokenizer.c \ src/shared.h \ src/shared.c \ - src/wpa_ctrl.h \ + src/wpa.h \ src/wpa_ctrl.c libowfd_la_CPPFLAGS = $(AM_CPPFLAGS) libowfd_la_LDFLAGS = $(AM_LDFLAGS) @@ -34,7 +34,6 @@ #include <unistd.h> #include "p2pd.h" #include "shl_log.h" -#include "wpa_ctrl.h" struct owfd_p2pd { struct owfd_p2pd_config config; diff --git a/src/p2pd_interface.c b/src/p2pd_interface.c index 8f2bfab..d98ee41 100644 --- a/src/p2pd_interface.c +++ b/src/p2pd_interface.c @@ -39,7 +39,7 @@ #include "p2pd.h" #include "shared.h" #include "shl_log.h" -#include "wpa_ctrl.h" +#include "wpa.h" struct owfd_p2pd_interface { struct owfd_wpa_ctrl *wpa; diff --git a/src/wpa_ctrl.h b/src/wpa.h index 314647e..9199fac 100644 --- a/src/wpa_ctrl.h +++ b/src/wpa.h @@ -23,8 +23,8 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef OWFD_WPA_CTRL_H -#define OWFD_WPA_CTRL_H +#ifndef OWFD_WPA_H +#define OWFD_WPA_H #include <signal.h> #include <stdbool.h> @@ -66,4 +66,4 @@ int owfd_wpa_ctrl_request_ok(struct owfd_wpa_ctrl *wpa, const void *cmd, } #endif -#endif /* OWFD_WPA_CTRL_H */ +#endif /* OWFD_WPA_H */ diff --git a/src/wpa_ctrl.c b/src/wpa_ctrl.c index fbfc85f..4829cb8 100644 --- a/src/wpa_ctrl.c +++ b/src/wpa_ctrl.c @@ -39,7 +39,7 @@ #include <time.h> #include <unistd.h> #include "shared.h" -#include "wpa_ctrl.h" +#include "wpa.h" #define CTRL_PATH_TEMPLATE "/tmp/openwfd-wpa-ctrl-%d-%lu-XXXXXX" #define REQ_REPLY_MAX 512 |