From 8fc3bf9808258370f319fba76f86385f983752a5 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Thu, 3 Mar 2016 18:51:42 +0000
Subject: [PATCH] Renamed capwap to cw

FossilOrigin-Name: e3db257e0552412e68e3778dc6a224abc3cc756c5a15fd06a02506fc600d448a
---
 src/wtp/cfg.c           | 28 ++++++++++++++--------------
 src/wtp/cfg.h           |  2 +-
 src/wtp/changestate.c   |  6 +++---
 src/wtp/conf_uci.c      | 10 +++++-----
 src/wtp/configure.c     |  4 ++--
 src/wtp/discovery.c     | 16 ++++++++--------
 src/wtp/image_update.c  |  8 ++++----
 src/wtp/join.c          | 16 ++++++++--------
 src/wtp/nlt.c           |  6 +++---
 src/wtp/run.c           | 22 +++++++++++-----------
 src/wtp/sulking.c       |  2 +-
 src/wtp/wtp.h           |  2 +-
 src/wtp/wtp_conf.c      | 14 +++++++-------
 src/wtp/wtp_conf.h      |  4 ++--
 src/wtp/wtp_interface.c |  6 +++---
 src/wtp/wtp_main.c      | 24 ++++++++++++------------
 src/wtp/wtpdrv.c        | 10 +++++-----
 17 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/src/wtp/cfg.c b/src/wtp/cfg.c
index e5082c15..70268ca3 100644
--- a/src/wtp/cfg.c
+++ b/src/wtp/cfg.c
@@ -1,25 +1,25 @@
-#include "capwap/mbag.h"
-#include "capwap/capwap_items.h"
-#include "capwap/radio.h"
+#include "cw/mbag.h"
+#include "cw/capwap_items.h"
+#include "cw/radio.h"
 
-#include "capwap/conn.h"
-#include "capwap/bstr.h"
+#include "cw/conn.h"
+#include "cw/bstr.h"
 
 #include <errno.h>
 #include <stdio.h>
 
 #include "jsmn.h"
 #include "wtp.h"
-#include "capwap/bstr.h"
+#include "cw/bstr.h"
 
-#include "capwap/mavl.h"
-#include "capwap/format.h"
-#include "capwap/file.h"
-//#include "capwap/aciplist.h"
-//#include "capwap/acpriolist.h"
-#include "capwap/sock.h"
-#include "capwap/item.h"
-#include "capwap/action.h"
+#include "cw/mavl.h"
+#include "cw/format.h"
+#include "cw/file.h"
+//#include "cw/aciplist.h"
+//#include "cw/acpriolist.h"
+#include "cw/sock.h"
+#include "cw/item.h"
+#include "cw/action.h"
 
 
 
diff --git a/src/wtp/cfg.h b/src/wtp/cfg.h
index 4048eeee..9f0ffea3 100644
--- a/src/wtp/cfg.h
+++ b/src/wtp/cfg.h
@@ -1,7 +1,7 @@
 #ifndef __WTP_CFG_H
 #define __WTP_CFG_H
 
-#include "capwap/conn.h"
+#include "cw/conn.h"
 
 int cfg_to_json();
 int cfg_from_json(struct conn * conn);
diff --git a/src/wtp/changestate.c b/src/wtp/changestate.c
index fbe94eed..2ec73e5f 100644
--- a/src/wtp/changestate.c
+++ b/src/wtp/changestate.c
@@ -1,6 +1,6 @@
-#include "capwap/capwap.h"
-#include "capwap/conn.h"
-#include "capwap/radio.h"
+#include "cw/capwap.h"
+#include "cw/conn.h"
+#include "cw/radio.h"
 
 #include "wtp_interface.h"
 
diff --git a/src/wtp/conf_uci.c b/src/wtp/conf_uci.c
index 8d4790c8..e4490972 100644
--- a/src/wtp/conf_uci.c
+++ b/src/wtp/conf_uci.c
@@ -11,14 +11,14 @@
 
 #include <uci.h>
 
-#include "capwap/capwap.h"
-#include "capwap/log.h"
+#include "cw/capwap.h"
+#include "cw/log.h"
 #include "wtp_conf.h"
 
-#include "capwap/log.h"
-#include "capwap/dbg.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
 
-#include "capwap/bstr.h"
+#include "cw/bstr.h"
 
 
 static struct uci_section  * get_anon_section(struct uci_package * pkg, const char *type)
diff --git a/src/wtp/configure.c b/src/wtp/configure.c
index d91dfbee..2844eaeb 100644
--- a/src/wtp/configure.c
+++ b/src/wtp/configure.c
@@ -1,6 +1,6 @@
 
-#include "capwap/capwap.h"
-#include "capwap/conn.h"
+#include "cw/capwap.h"
+#include "cw/conn.h"
 #include "wtp_interface.h"
 
 int configure()
diff --git a/src/wtp/discovery.c b/src/wtp/discovery.c
index 2bea3d60..7c34200a 100644
--- a/src/wtp/discovery.c
+++ b/src/wtp/discovery.c
@@ -24,14 +24,14 @@
 #include <sys/socket.h>
 
 
-#include "capwap/capwap.h"
-#include "capwap/capwap_items.h"
-#include "capwap/log.h"
-#include "capwap/sock.h"
-#include "capwap/cw_util.h"
-#include "capwap/aciplist.h"
-#include "capwap/acpriolist.h"
-#include "capwap/timer.h"
+#include "cw/capwap.h"
+#include "cw/capwap_items.h"
+#include "cw/log.h"
+#include "cw/sock.h"
+#include "cw/cw_util.h"
+#include "cw/aciplist.h"
+#include "cw/acpriolist.h"
+#include "cw/timer.h"
 
 
 #include "wtp.h"
diff --git a/src/wtp/image_update.c b/src/wtp/image_update.c
index 3c094b40..b825aed1 100644
--- a/src/wtp/image_update.c
+++ b/src/wtp/image_update.c
@@ -1,10 +1,10 @@
 #include <errno.h>
 #include "wtp.h"
 
-#include "capwap/log.h"
-#include "capwap/dbg.h"
-#include "capwap/capwap.h"
-#include "capwap/capwap_items.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+#include "cw/capwap.h"
+#include "cw/capwap_items.h"
 
 
 int image_update()
diff --git a/src/wtp/join.c b/src/wtp/join.c
index 1f62dc3d..3f13e256 100644
--- a/src/wtp/join.c
+++ b/src/wtp/join.c
@@ -8,14 +8,14 @@
 #include "wtp_interface.h"
 #include "wtp_conf.h"
 
-#include "capwap/dtls.h"
-#include "capwap/log.h"
-#include "capwap/dbg.h"
-#include "capwap/sock.h"
-#include "capwap/dtls.h"
-#include "capwap/aciplist.h"
-#include "capwap/capwap_items.h"
-#include "capwap/mbag.h"
+#include "cw/dtls.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+#include "cw/sock.h"
+#include "cw/dtls.h"
+#include "cw/aciplist.h"
+#include "cw/capwap_items.h"
+#include "cw/mbag.h"
 
 /*
 #define acinfo_log acinfo_log_
diff --git a/src/wtp/nlt.c b/src/wtp/nlt.c
index 430cb0b6..fcf7d2c1 100644
--- a/src/wtp/nlt.c
+++ b/src/wtp/nlt.c
@@ -3,9 +3,9 @@
 #include "netlink/genl/ctrl.h"
 #include <netlink/msg.h>
 
-#include "capwap/log.h"
-#include "capwap/dbg.h"
-#include "capwap/avltree.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+#include "cw/avltree.h"
 
 #include "nlt.h"
 
diff --git a/src/wtp/run.c b/src/wtp/run.c
index f87a7480..dbcd30a9 100644
--- a/src/wtp/run.c
+++ b/src/wtp/run.c
@@ -3,25 +3,25 @@
 #include <errno.h>
 #include <string.h>
 
-#include "capwap/capwap.h"
-#include "capwap/conn.h"
-#include "capwap/radioinfo.h"
-#include "capwap/log.h"
-#include "capwap/dtls.h"
-#include "capwap/sock.h"
-#include "capwap/cw_util.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/conn.h"
+#include "cw/radioinfo.h"
+#include "cw/log.h"
+#include "cw/dtls.h"
+#include "cw/sock.h"
+#include "cw/cw_util.h"
+#include "cw/capwap_items.h"
 
 
 #include "wtp_conf.h"
 
 
-#include "capwap/timer.h"
+#include "cw/timer.h"
 
 
 
-#include "capwap/capwap.h"
-#include "capwap/conn.h"
+#include "cw/capwap.h"
+#include "cw/conn.h"
 #include "wtp_interface.h"
 
 
diff --git a/src/wtp/sulking.c b/src/wtp/sulking.c
index ae78b4fb..e83a1874 100644
--- a/src/wtp/sulking.c
+++ b/src/wtp/sulking.c
@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include "capwap/dbg.h"
+#include "cw/dbg.h"
 
 #include "wtp.h"
 #include "wtp_conf.h"
diff --git a/src/wtp/wtp.h b/src/wtp/wtp.h
index 8be7032b..a52f593d 100644
--- a/src/wtp/wtp.h
+++ b/src/wtp/wtp.h
@@ -1,7 +1,7 @@
 #ifndef __WTP_H
 #define __WTP_H
 
-#include "capwap/conn.h"
+#include "cw/conn.h"
 
 
 
diff --git a/src/wtp/wtp_conf.c b/src/wtp/wtp_conf.c
index 4c8b3fa4..620c786d 100644
--- a/src/wtp/wtp_conf.c
+++ b/src/wtp/wtp_conf.c
@@ -11,19 +11,19 @@
 #include <net/if.h>
 
 
-#include "capwap/capwap.h"
-#include "capwap/log.h"
-#include "capwap/dbg.h"
+#include "cw/capwap.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
 
-#include "capwap/cw_util.h"
+#include "cw/cw_util.h"
 
 #include "wtp_conf.h"
 
 
-#include "capwap/sock.h"
-#include "capwap/log.h"
+#include "cw/sock.h"
+#include "cw/log.h"
 
-#include "capwap/bstr.h"
+#include "cw/bstr.h"
 
 
 char * conf_primary_if=0;
diff --git a/src/wtp/wtp_conf.h b/src/wtp/wtp_conf.h
index 800c7fe5..41944e61 100644
--- a/src/wtp/wtp_conf.h
+++ b/src/wtp/wtp_conf.h
@@ -3,8 +3,8 @@
 
 #include <sys/socket.h>
 
-#include "capwap/capwap.h"
-#include "capwap/bstr.h"
+#include "cw/capwap.h"
+#include "cw/bstr.h"
 
 
 
diff --git a/src/wtp/wtp_interface.c b/src/wtp/wtp_interface.c
index 4b4bbc73..7784cab3 100644
--- a/src/wtp/wtp_interface.c
+++ b/src/wtp/wtp_interface.c
@@ -2,9 +2,9 @@
 #include <string.h>
 
 
-#include "capwap/conn.h"
-#include "capwap/capwap_80211.h"
-#include "capwap/log.h"
+#include "cw/conn.h"
+#include "cw/capwap_80211.h"
+#include "cw/log.h"
 
 #include "wtp_conf.h"
 #include "wtp_interface.h"
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index 5f7900e3..6fd0cd9c 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -3,24 +3,24 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "capwap/capwap.h"
-#include "capwap/cipwap.h"
-#include "capwap/capwap_items.h"
-#include "capwap/conn.h"
-#include "capwap/log.h"
-#include "capwap/dtls.h"
-#include "capwap/acpriolist.h"
-#include "capwap/capwap_80211.h"
-#include "capwap/radio.h"
+#include "cw/capwap.h"
+#include "cw/cipwap.h"
+#include "cw/capwap_items.h"
+#include "cw/conn.h"
+#include "cw/log.h"
+#include "cw/dtls.h"
+#include "cw/acpriolist.h"
+#include "cw/capwap_80211.h"
+#include "cw/radio.h"
 
-#include "capwap/mod.h"
+#include "cw/mod.h"
 
 
 #include "wtp.h"
 #include "wtp_conf.h"
 
-#include "capwap/dbg.h"
-#include "capwap/mavl.h"
+#include "cw/dbg.h"
+#include "cw/mavl.h"
 
 #include "jsmn.h"
 
diff --git a/src/wtp/wtpdrv.c b/src/wtp/wtpdrv.c
index f791a04c..4ff5136b 100644
--- a/src/wtp/wtpdrv.c
+++ b/src/wtp/wtpdrv.c
@@ -12,11 +12,11 @@
 //#include "nlt.h"
 
 
-#include "capwap/log.h"
-#include "capwap/radioinfo.h"
-#include "capwap/sock.h"
-#include "capwap/capwap_80211.h"
-#include "capwap/dbg.h"
+#include "cw/log.h"
+#include "cw/radioinfo.h"
+#include "cw/sock.h"
+#include "cw/capwap_80211.h"
+#include "cw/dbg.h"
 
 /*
 int wpa_printf()