Removing Single/Double underscores at beginning of the preprocessor directives

Change-Id: I7fcb060f9a2db955032768d4c8417c920a90299f
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/994
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h
index e3c2981..1060410 100644 (file)
--- a/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@ -337,5 +337,5 @@ typedef struct
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_COMMON_H_
+#endif /* CA_COMMON_H_ */
 

diff --git a/resource/csdk/connectivity/api/cainterface.h b/resource/csdk/connectivity/api/cainterface.h
index 91c29c5..7607bfc 100644 (file)
--- a/resource/csdk/connectivity/api/cainterface.h
+++ b/resource/csdk/connectivity/api/cainterface.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for Resource Model to use.
  */
 
-#ifndef __CA_INTERFACE_H_
-#define __CA_INTERFACE_H_
+#ifndef CA_INTERFACE_H_
+#define CA_INTERFACE_H_
 
 /**
  * Connectivity Abstraction Interface APIs.
@@ -278,5 +278,5 @@ CAResult_t CAHandleRequestResponse();
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_INTERFACE_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/camutex.h b/resource/csdk/connectivity/common/inc/camutex.h
index e138006..be7b085 100644 (file)
--- a/resource/csdk/connectivity/common/inc/camutex.h
+++ b/resource/csdk/connectivity/common/inc/camutex.h
@@ -24,8 +24,8 @@
  * This file provides APIs related to mutex and semaphores.
  */
 
-#ifndef _CAMUTEX_H_
-#define _CAMUTEX_H_
+#ifndef CA_MUTEX_H_
+#define CA_MUTEX_H_
 
 #include "cacommon.h"
 
@@ -151,5 +151,5 @@ void ca_cond_free(ca_cond cond);
 } /* extern "C" */
 #endif /* __cplusplus */
 
-#endif /*__UMUTEX_H_ */
+#endif /* CA_MUTEX_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/cathreadpool.h b/resource/csdk/connectivity/common/inc/cathreadpool.h
index 135d359..9df11e9 100644 (file)
--- a/resource/csdk/connectivity/common/inc/cathreadpool.h
+++ b/resource/csdk/connectivity/common/inc/cathreadpool.h
@@ -28,8 +28,8 @@
  * a name that best describes the used technology, not the OS.
  */
 
-#ifndef CATHREAD_POOL_H_
-#define CATHREAD_POOL_H_
+#ifndef CA_THREAD_POOL_H_
+#define CA_THREAD_POOL_H_
 
 #include "cacommon.h"
 
@@ -86,5 +86,5 @@ void ca_thread_pool_free(ca_thread_pool_t thread_pool);
 } /* extern "C" */
 #endif /* __cplusplus */
 
-#endif /* CATHREAD_POOL_H_ */
+#endif /* CA_THREAD_POOL_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/logger.h b/resource/csdk/connectivity/common/inc/logger.h
index 61f363d..fddc5b7 100644 (file)
--- a/resource/csdk/connectivity/common/inc/logger.h
+++ b/resource/csdk/connectivity/common/inc/logger.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _U_LOGGER_H_
-#define _U_LOGGER_H_
+#ifndef U_LOGGER_H_
+#define U_LOGGER_H_
 
 #include <stdint.h>
 #include <stdio.h>
@@ -211,5 +211,5 @@ void OICLogv(LogLevel level, PROGMEM const char *tag, const int16_t lineNum,
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif /* _U_LOGGER_H_ */
+#endif /* U_LOGGER_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/oic_console_logger.h b/resource/csdk/connectivity/common/inc/oic_console_logger.h
index ac0374d..bb09eb0 100644 (file)
--- a/resource/csdk/connectivity/common/inc/oic_console_logger.h
+++ b/resource/csdk/connectivity/common/inc/oic_console_logger.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef __OIC_CONSOLE_LOGGER_
-#define __OIC_CONSOLE_LOGGER_
+#ifndef OIC_CONSOLE_LOGGER_
+#define OIC_CONSOLE_LOGGER_
 
 #include "oic_logger_types.h"
 
@@ -41,5 +41,5 @@ int oic_console_logger_set_module(oic_log_ctx_t *ctx, const char *module_name);
 } // extern "C"
 #endif
 
-#endif
+#endif /* OIC_CONSOLE_LOGGER_ */
 

diff --git a/resource/csdk/connectivity/common/inc/oic_logger.h b/resource/csdk/connectivity/common/inc/oic_logger.h
index 9e1cbc3..d1a5b8d 100644 (file)
--- a/resource/csdk/connectivity/common/inc/oic_logger.h
+++ b/resource/csdk/connectivity/common/inc/oic_logger.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef __OIC_LOGGER_H_
-#define __OIC_LOGGER_H_
+#ifndef OIC_LOGGER_H_
+#define OIC_LOGGER_H_
 
 #include "oic_logger_types.h"
 
@@ -46,5 +46,5 @@ int oic_log_set_module(oic_log_ctx_t *ctx, const char *module_name);
 } // extern "C"
 #endif
 
-#endif
+#endif /* OIC_LOGGER_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/oic_logger_types.h b/resource/csdk/connectivity/common/inc/oic_logger_types.h
index 8271f1d..121270b 100644 (file)
--- a/resource/csdk/connectivity/common/inc/oic_logger_types.h
+++ b/resource/csdk/connectivity/common/inc/oic_logger_types.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef __OIC_LOGGER_TYPES_H_
-#define __OIC_LOGGER_TYPES_H_
+#ifndef OIC_LOGGER_TYPES_H_
+#define OIC_LOGGER_TYPES_H_
 
 #include <stddef.h>
 
@@ -83,5 +83,5 @@ typedef int (*oic_log_try_lock_t)(oic_log_ctx_t *);
 } // extern "C"
 #endif
 
-#endif
+#endif /* OIC_LOGGER_TYPES_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/oic_malloc.h b/resource/csdk/connectivity/common/inc/oic_malloc.h
index be614af..df0b7b2 100644 (file)
--- a/resource/csdk/connectivity/common/inc/oic_malloc.h
+++ b/resource/csdk/connectivity/common/inc/oic_malloc.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _OIC_MALLOC_H_
-#define _OIC_MALLOC_H_
+#ifndef OIC_MALLOC_H_
+#define OIC_MALLOC_H_
 
 // The purpose of this module is to allow custom dynamic memory allocation
 // code to easily be added to the TB Stack by redefining the OICMalloc and
@@ -94,5 +94,5 @@ void OICFree(void *ptr);
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif /* _OIC_MALLOC_H_ */
+#endif /* OIC_MALLOC_H_ */
 

diff --git a/resource/csdk/connectivity/common/inc/oic_string.h b/resource/csdk/connectivity/common/inc/oic_string.h
index 3f830f2..5c823ba 100644 (file)
--- a/resource/csdk/connectivity/common/inc/oic_string.h
+++ b/resource/csdk/connectivity/common/inc/oic_string.h
@@ -17,8 +17,8 @@
  * limitations under the License.
  *
  ******************************************************************/
-#ifndef _OIC_STRING_H_
-#define _OIC_STRING_H_
+#ifndef OIC_STRING_H_
+#define OIC_STRING_H_
 
 #ifdef __cplusplus
 extern "C"
@@ -41,6 +41,4 @@ char *OICStrdup(const char *str);
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif
-/* _OIC_STRING_H_ */
-
+#endif /* OIC_STRING_H_ */

diff --git a/resource/csdk/connectivity/common/inc/uarraylist.h b/resource/csdk/connectivity/common/inc/uarraylist.h
index 245c195..17edead 100644 (file)
--- a/resource/csdk/connectivity/common/inc/uarraylist.h
+++ b/resource/csdk/connectivity/common/inc/uarraylist.h
@@ -18,8 +18,8 @@
  *
  ******************************************************************/
 
-#ifndef __U_ARRAYLIST_H_
-#define __U_ARRAYLIST_H_
+#ifndef U_ARRAYLIST_H_
+#define U_ARRAYLIST_H_
 
 #include <stdint.h>
 #include "cacommon.h"
@@ -109,4 +109,4 @@ bool u_arraylist_contains(const u_arraylist_t *list,const void *data);
 }
 #endif
 
-#endif /* _U_ARRAYLIST_H_ */
+#endif /* U_ARRAYLIST_H_ */

diff --git a/resource/csdk/connectivity/common/inc/uqueue.h b/resource/csdk/connectivity/common/inc/uqueue.h
index e8694fa..cc9a8bb 100644 (file)
--- a/resource/csdk/connectivity/common/inc/uqueue.h
+++ b/resource/csdk/connectivity/common/inc/uqueue.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for queue to be implemented.
  */
 
-#ifndef __U_QUEUE_H_
-#define __U_QUEUE_H_
+#ifndef U_QUEUE_H_
+#define U_QUEUE_H_
 
 #include "cacommon.h"
 
@@ -145,5 +145,5 @@ u_queue_message_t *u_queue_get_head(u_queue_t *queue);
 } /* extern "C" */
 #endif /* __cplusplus */
 
-#endif /* _U_QUEUE_H_ */
+#endif /* U_QUEUE_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caadapterinterface.h b/resource/csdk/connectivity/inc/caadapterinterface.h
index d51c41f..d0da447 100644 (file)
--- a/resource/csdk/connectivity/inc/caadapterinterface.h
+++ b/resource/csdk/connectivity/inc/caadapterinterface.h
@@ -179,5 +179,5 @@ typedef void (*CANetworkChangeCallback)(CALocalConnectivity_t *info, CANetworkSt
 } /* extern "C" */
 #endif
 
-#endif  // CA_ADAPTER_INTERFACE_H_
+#endif  /* CA_ADAPTER_INTERFACE_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caadapternetdtls.h b/resource/csdk/connectivity/inc/caadapternetdtls.h
index 86a7322..debf3d3 100644 (file)
--- a/resource/csdk/connectivity/inc/caadapternetdtls.h
+++ b/resource/csdk/connectivity/inc/caadapternetdtls.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 *
 ******************************************************************/
-#ifndef _CA_ADAPTER_NET_DTLS_H
-#define _CA_ADAPTER_NET_DTLS_H
+#ifndef CA_ADAPTER_NET_DTLS_H_
+#define CA_ADAPTER_NET_DTLS_H_
 
 #include "dtls.h"
 #include "uarraylist.h"
@@ -225,6 +225,6 @@ CAResult_t CAAdapterNetDtlsDecrypt(const char *remoteAddress,
                                    uint32_t dataLen,
                                    eDtlsAdapterType_t type);
 
-#endif //_CA_ADAPTER_NET_DTLS_H
+#endif /* CA_ADAPTER_NET_DTLS_H_ */
 
 

diff --git a/resource/csdk/connectivity/inc/caadapterutils.h b/resource/csdk/connectivity/inc/caadapterutils.h
index 4287319..f78cebb 100644 (file)
--- a/resource/csdk/connectivity/inc/caadapterutils.h
+++ b/resource/csdk/connectivity/inc/caadapterutils.h
@@ -308,5 +308,5 @@ JavaVM *CANativeJNIGetJavaVM();
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-#endif  // CA_ADAPTER_UTILS_H_
+#endif  /* CA_ADAPTER_UTILS_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caedradapter.h b/resource/csdk/connectivity/inc/caedradapter.h
index 6f67eb2..678f864 100644 (file)
--- a/resource/csdk/connectivity/inc/caedradapter.h
+++ b/resource/csdk/connectivity/inc/caedradapter.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for EDR adapters.
  */
 
-#ifndef __CA_EDRADAPTER_H_
-#define __CA_EDRADAPTER_H_
+#ifndef CA_EDRADAPTER_H_
+#define CA_EDRADAPTER_H_
 
 /**
  * EDR Interface AP
@@ -138,5 +138,5 @@ CAResult_t CAAdapterStartQueue();
 } /* extern "C" */
 #endif
 
-#endif  //__CA_EDRADAPTER_H_
+#endif  /* CA_EDRADAPTER_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caedradapter_singlethread.h b/resource/csdk/connectivity/inc/caedradapter_singlethread.h
index 5648726..a5996d0 100644 (file)
--- a/resource/csdk/connectivity/inc/caedradapter_singlethread.h
+++ b/resource/csdk/connectivity/inc/caedradapter_singlethread.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for EDR adapters to be implemented.
  */
 
-#ifndef __CA_EDRADAPTER_SINGLETHREAD_H_
-#define __CA_EDRADAPTER_SINGLETHREAD_H_
+#ifndef CA_EDRADAPTER_SINGLETHREAD_H_
+#define CA_EDRADAPTER_SINGLETHREAD_H_
 
 /**
  * EDR Interface AP
@@ -149,5 +149,5 @@ void CATerminateEDR();
 } /* extern "C" */
 #endif
 
-#endif  //__CA_EDRADAPTER_SINGLETHREAD_H_
+#endif  /* CA_EDRADAPTER_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caedrinterface.h b/resource/csdk/connectivity/inc/caedrinterface.h
index df9e86c..57ac40e 100644 (file)
--- a/resource/csdk/connectivity/inc/caedrinterface.h
+++ b/resource/csdk/connectivity/inc/caedrinterface.h
@@ -25,8 +25,8 @@
  * modules.
  */
 
-#ifndef __CA_EDR_INTERFACE_H_
-#define __CA_EDR_INTERFACE_H_
+#ifndef CA_EDR_INTERFACE_H_
+#define CA_EDR_INTERFACE_H_
 
 #include "caedradapter.h"
 
@@ -284,5 +284,5 @@ CAResult_t CAEDRGetBondedDeviceList();
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_INTERFACE_H_
+#endif /* CA_EDR_INTERFACE_H_ */
 

diff --git a/resource/csdk/connectivity/inc/cainterfacecontroller.h b/resource/csdk/connectivity/inc/cainterfacecontroller.h
index c68310b..8aa5940 100644 (file)
--- a/resource/csdk/connectivity/inc/cainterfacecontroller.h
+++ b/resource/csdk/connectivity/inc/cainterfacecontroller.h
@@ -118,5 +118,5 @@ void CATerminateAdapters();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_INTERFACE_CONTROLLER_H_
+#endif /* CA_INTERFACE_CONTROLLER_H_ */
 

diff --git a/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h b/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
index a781500..70f0759 100644 (file)
--- a/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
+++ b/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
@@ -127,5 +127,5 @@ CAResult_t CAReadData();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef __CA_INTERFACE_CONTROLLER_H_
+#endif /* CA_INTERFACE_CONTROLLER_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caipadapter_singlethread.h b/resource/csdk/connectivity/inc/caipadapter_singlethread.h
index 2969878..7625a04 100644 (file)
--- a/resource/csdk/connectivity/inc/caipadapter_singlethread.h
+++ b/resource/csdk/connectivity/inc/caipadapter_singlethread.h
@@ -124,5 +124,5 @@ void CATerminateIP();
 } /* extern "C" */
 #endif
 
-#endif  // #ifndef CA_IP_ADAPTER_SINGLETHREAD_H_
+#endif  /* CA_IP_ADAPTER_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caipinterface.h b/resource/csdk/connectivity/inc/caipinterface.h
index abc7b93..092a51e 100644 (file)
--- a/resource/csdk/connectivity/inc/caipinterface.h
+++ b/resource/csdk/connectivity/inc/caipinterface.h
@@ -325,4 +325,4 @@ void CAIPSetConnectionStateChangeCallback(CAIPConnectionStateChangeCallback call
 }
 #endif
 
-#endif //CA_IP_INTERFACE_H_
+#endif /* CA_IP_INTERFACE_H_ */

diff --git a/resource/csdk/connectivity/inc/caipinterface_singlethread.h b/resource/csdk/connectivity/inc/caipinterface_singlethread.h
index e0d11a0..69133c3 100644 (file)
--- a/resource/csdk/connectivity/inc/caipinterface_singlethread.h
+++ b/resource/csdk/connectivity/inc/caipinterface_singlethread.h
@@ -303,5 +303,5 @@ void CAIPSetConnectionStateChangeCallback
 }
 #endif
 
-#endif //CA_IP_INTERFACE_SINGLETHREAD_H_
+#endif /* CA_IP_INTERFACE_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caleadapter.h b/resource/csdk/connectivity/inc/caleadapter.h
index 29994e2..ad6e4bb 100644 (file)
--- a/resource/csdk/connectivity/inc/caleadapter.h
+++ b/resource/csdk/connectivity/inc/caleadapter.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for LE adapters to be implemented.
  */
 
-#ifndef _CA_LEADAPTER_H_
-#define _CA_LEADAPTER_H_
+#ifndef CA_LEADAPTER_H_
+#define CA_LEADAPTER_H_
 
 #include "cacommon.h"
 #include "caadapterinterface.h"
@@ -436,5 +436,5 @@ typedef CAResult_t (*CABLEServerDataReceivedCallback)(const char *remoteAddress,
 } /* extern "C" */
 #endif
 
-#endif //#ifndef _CA_LEADAPTER_H_
+#endif /* CA_LEADAPTER_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caleadapter_singlethread.h b/resource/csdk/connectivity/inc/caleadapter_singlethread.h
index 4ca59c1..c790889 100644 (file)
--- a/resource/csdk/connectivity/inc/caleadapter_singlethread.h
+++ b/resource/csdk/connectivity/inc/caleadapter_singlethread.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for LE adapters to be implemented.
  */
 
-#ifndef _CA_LEADAPTER_SINGLETHREAD_H_
-#define _CA_LEADAPTER_SINGLETHREAD_H_
+#ifndef CA_LEADAPTER_SINGLETHREAD_H_
+#define CA_LEADAPTER_SINGLETHREAD_H_
 
 #include "cacommon.h"
 #include "caadapterinterface.h"
@@ -423,5 +423,5 @@ typedef CAResult_t (*CABLEServerDataReceivedCallback)(const char *remoteAddress,
 } /* extern "C" */
 #endif
 
-#endif //#ifndef _CA_LEADAPTER_SINGLETHREAD_H_
+#endif /* CA_LEADAPTER_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caleinterface.h b/resource/csdk/connectivity/inc/caleinterface.h
index aae6e86..ff1ab29 100644 (file)
--- a/resource/csdk/connectivity/inc/caleinterface.h
+++ b/resource/csdk/connectivity/inc/caleinterface.h
@@ -24,8 +24,8 @@
  * This file provides APIs for BLE modules.
  */
 
-#ifndef _CA_LE_INTERFACE_H_
-#define _CA_LE_INTERFACE_H_
+#ifndef CA_LE_INTERFACE_H_
+#define CA_LE_INTERFACE_H_
 
 #include <stdbool.h>
 
@@ -290,5 +290,5 @@ CAResult_t CAUnSetLEAdapterStateChangedCb();
 }
 #endif
 
-#endif //_CA_LE_INTERFACE_H_
+#endif /* CA_LE_INTERFACE_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caleinterface_singlethread.h b/resource/csdk/connectivity/inc/caleinterface_singlethread.h
index 06fe17c..6cc639b 100644 (file)
--- a/resource/csdk/connectivity/inc/caleinterface_singlethread.h
+++ b/resource/csdk/connectivity/inc/caleinterface_singlethread.h
@@ -24,8 +24,8 @@
  * This file provides APIs for BLE modules.
  */
 
-#ifndef _CA_LE_INTERFACE_SINGLETHREAD_H_
-#define _CA_LE_INTERFACE_SINGLETHREAD_H_
+#ifndef CA_LE_INTERFACE_SINGLETHREAD_H_
+#define CA_LE_INTERFACE_SINGLETHREAD_H_
 
 #include <stdbool.h>
 
@@ -212,5 +212,5 @@ void CASetBLEReqRespClientCallback(CABLEClientDataReceivedCallback callback);
 }
 #endif
 
-#endif //_CA_LE_INTERFACE_SINGLETHREAD_H_
+#endif /* CA_LE_INTERFACE_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/camessagehandler.h b/resource/csdk/connectivity/inc/camessagehandler.h
index 93c2e60..e5ee5cb 100644 (file)
--- a/resource/csdk/connectivity/inc/camessagehandler.h
+++ b/resource/csdk/connectivity/inc/camessagehandler.h
@@ -23,8 +23,8 @@
  * @brief This file contains message functionality.
  */
 
-#ifndef __CA_MESSAGE_HANDLER_H_
-#define __CA_MESSAGE_HANDLER_H_
+#ifndef CA_MESSAGE_HANDLER_H_
+#define CA_MESSAGE_HANDLER_H_
 
 #include "cacommon.h"
 #include "coap.h"
@@ -133,5 +133,5 @@ void CALogPDUInfo(coap_pdu_t *pdu);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef __CA_MESSAGE_HANDLER_H_
+#endif /* CA_MESSAGE_HANDLER_H_ */
 

diff --git a/resource/csdk/connectivity/inc/camessagehandler_singlethread.h b/resource/csdk/connectivity/inc/camessagehandler_singlethread.h
index 0c68faa..469c6ea 100644 (file)
--- a/resource/csdk/connectivity/inc/camessagehandler_singlethread.h
+++ b/resource/csdk/connectivity/inc/camessagehandler_singlethread.h
@@ -23,8 +23,8 @@
  * @brief This file contains message functionality.
  */
 
-#ifndef __CA_MESSAGE_HANDLER_SINGLETHREAD_H_
-#define __CA_MESSAGE_HANDLER_SINGLETHREAD_H_
+#ifndef CA_MESSAGE_HANDLER_SINGLETHREAD_H_
+#define CA_MESSAGE_HANDLER_SINGLETHREAD_H_
 
 #include "cacommon.h"
 #include "coap.h"
@@ -133,5 +133,5 @@ void CALogPDUInfo(coap_pdu_t *pdu);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef __CA_MESSAGE_HANDLER_SINGLETHREAD_H_
+#endif /* CA_MESSAGE_HANDLER_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/camsgparser.h b/resource/csdk/connectivity/inc/camsgparser.h
index b932cf0..e7504bc 100644 (file)
--- a/resource/csdk/connectivity/inc/camsgparser.h
+++ b/resource/csdk/connectivity/inc/camsgparser.h
@@ -25,8 +25,8 @@
  * fragmentation and reassemebly.
  */
 
-#ifndef _CA_MSG_PARSER_H_
-#define _CA_MSG_PARSER_H_
+#ifndef CA_MSG_PARSER_H_
+#define CA_MSG_PARSER_H_
 
 #include "cacommon.h"
 #include "logger.h"
@@ -185,5 +185,5 @@ uint32_t CAParseHeader(const char *header);
 } /* extern "C" */
 #endif
 
-#endif  // _CA_MSG_PARSER_H_
+#endif  /* CA_MSG_PARSER_H_ */
 

diff --git a/resource/csdk/connectivity/inc/canetworkconfigurator.h b/resource/csdk/connectivity/inc/canetworkconfigurator.h
index a407aea..2031ab6 100644 (file)
--- a/resource/csdk/connectivity/inc/canetworkconfigurator.h
+++ b/resource/csdk/connectivity/inc/canetworkconfigurator.h
@@ -74,5 +74,5 @@ CAResult_t CATerminateNetworkType();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef NETWORK_CONFIGURATOR_H_
+#endif /* NETWORK_CONFIGURATOR_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caprotocolmessage.h b/resource/csdk/connectivity/inc/caprotocolmessage.h
index 76b4dd0..d96c7a3 100644 (file)
--- a/resource/csdk/connectivity/inc/caprotocolmessage.h
+++ b/resource/csdk/connectivity/inc/caprotocolmessage.h
@@ -231,4 +231,4 @@ CAResponseResult_t CAGetCodeFromPduBinaryData(const void *pdu, uint32_t size);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_PROTOCOL_MESSAGE_H_
+#endif /* CA_PROTOCOL_MESSAGE_H_ */

diff --git a/resource/csdk/connectivity/inc/caqueueingthread.h b/resource/csdk/connectivity/inc/caqueueingthread.h
index deb7296..b3d282d 100644 (file)
--- a/resource/csdk/connectivity/inc/caqueueingthread.h
+++ b/resource/csdk/connectivity/inc/caqueueingthread.h
@@ -24,8 +24,8 @@
  * This file contains common utility function for handling message ques.
  */
 
-#ifndef CA_QUEUEINGTHREAD_H_
-#define CA_QUEUEINGTHREAD_H_
+#ifndef CA_QUEUEING_THREAD_H_
+#define CA_QUEUEING_THREAD_H_
 
 #include <stdint.h>
 
@@ -109,5 +109,5 @@ CAResult_t CAQueueingThreadDestroy(CAQueueingThread_t *thread);
 } /* extern "C" */
 #endif
 
-#endif  // CA_QUEUEINGTHREAD_H_
+#endif  /* CA_QUEUEING_THREAD_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caremotehandler.h b/resource/csdk/connectivity/inc/caremotehandler.h
index 528f7ac..002a6c5 100644 (file)
--- a/resource/csdk/connectivity/inc/caremotehandler.h
+++ b/resource/csdk/connectivity/inc/caremotehandler.h
@@ -100,5 +100,5 @@ void CADestroyResponseInfoInternal(CAResponseInfo_t *response);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_REMOTE_HANDLER_H_
+#endif /* CA_REMOTE_HANDLER_H_ */
 

diff --git a/resource/csdk/connectivity/inc/caretransmission.h b/resource/csdk/connectivity/inc/caretransmission.h
index 996612e..052fa41 100644 (file)
--- a/resource/csdk/connectivity/inc/caretransmission.h
+++ b/resource/csdk/connectivity/inc/caretransmission.h
@@ -163,4 +163,4 @@ CAResult_t CARetransmissionDestroy(CARetransmission_t *context);
 } /* extern "C" */
 #endif
 
-#endif  // CA_RETRANSMISSION_H_
+#endif  /* CA_RETRANSMISSION_H_ */

diff --git a/resource/csdk/connectivity/inc/caretransmission_singlethread.h b/resource/csdk/connectivity/inc/caretransmission_singlethread.h
index f91d8d6..5e581be 100644 (file)
--- a/resource/csdk/connectivity/inc/caretransmission_singlethread.h
+++ b/resource/csdk/connectivity/inc/caretransmission_singlethread.h
@@ -151,5 +151,5 @@ void CARetransmissionBaseRoutine(void *threadValue);
 } /* extern "C" */
 #endif
 
-#endif  // CA_RETRANSMISSION_SINGLETHREAD_H_
+#endif  /* CA_RETRANSMISSION_SINGLETHREAD_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
index de0cf99..e655193 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
@@ -165,5 +165,5 @@ void CAEDRNativeSocketClose(JNIEnv *env, const char *address, uint32_t id);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_CLIENT_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h
index 102c507..947d501 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h
@@ -22,8 +22,8 @@
  * @file
  * @brief This file contains the APIs for BT LE communications.
  */
-#ifndef CA_EDR_NWMONITOR_H_
-#define CA_EDR_NWMONITOR_H_
+#ifndef CA_EDR_NW_MONITOR_H_
+#define CA_EDR_NW_MONITOR_H_
 
 #include "cacommon.h"
 
@@ -48,5 +48,5 @@ void CAEDRNetworkMonitorJniInit();
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_NW_MONITOR_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
index 6e3a58d..faa4a6a 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
@@ -138,5 +138,5 @@ void CAEDRNatvieCloseServerTask(JNIEnv* env);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_SERVER_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
index 148ccca..1348546 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
@@ -22,8 +22,8 @@
  * @file
  * @brief This file contains the APIs for BT communications.
  */
-#ifndef CA_EDR_UTILES_H_
-#define CA_EDR_UTILES_H_
+#ifndef CA_EDR_UTILS_H_
+#define CA_EDR_UTILS_H_
 
 #include "cacommon.h"
 #include "cathreadpool.h"
@@ -226,5 +226,5 @@ void CAEDRReorderingDeviceSocketList(uint32_t index);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_UTILS_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h
index d42a48b..eec78cd 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h
@@ -24,8 +24,8 @@
  * This file provides APIs to manage discovered bluetooth device list.
  */
 
-#ifndef __CA_EDR_DEVICE_LIST_H_
-#define __CA_EDR_DEVICE_LIST_H_
+#ifndef CA_EDR_DEVICE_LIST_H_
+#define CA_EDR_DEVICE_LIST_H_
 
 #include "cacommon.h"
 
@@ -192,6 +192,6 @@ void CADestroyEDRDataList(EDRDataList **dataList);
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_DEVICE_LIST_H_
+#endif /* CA_EDR_DEVICE_LIST_H_ */
 
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h
index f01a547..3df03f3 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h
@@ -24,8 +24,8 @@
  * This file provides the APIs to send data on established RFCOMM connections.
  */
 
-#ifndef __CA_EDR_ENDPOINT_H_
-#define __CA_EDR_ENDPOINT_H_
+#ifndef CA_EDR_ENDPOINT_H_
+#define CA_EDR_ENDPOINT_H_
 
 #include <bluetooth.h>
 
@@ -56,6 +56,6 @@ CAResult_t CAEDRSendData(int serverFD, const void *data, uint32_t dataLength,
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_ENDPOINT_H_
+#endif /* CA_EDR_ENDPOINT_H_ */
 
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
index 91bd9bd..466ad63 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
@@ -24,8 +24,8 @@
  * This file provides helper functions for EDR adapter.
  */
 
-#ifndef __CA_EDR_UTILS_H_
-#define __CA_EDR_UTILS_H_
+#ifndef CA_EDR_UTILS_H_
+#define CA_EDR_UTILS_H_
 
 #include <stdbool.h>
 #include <string.h>
@@ -63,6 +63,6 @@ bool CAEDRIsServiceSupported(const char **serviceUUID, int32_t serviceCount,
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_UTILS_H_
+#endif /* CA_EDR_UTILS_H_ */
 
 

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
index 17152be..edfec61 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
@@ -594,4 +594,4 @@ void CALEClientSetTheSendRequestFlag(bool flag);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_LECLIENT_H_ */

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
index ade8d6e..c04a0d6 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
@@ -59,5 +59,5 @@ void CALESetNetStateCallback(CALEDeviceStateChangedCallback callback);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_LENWMONITOR_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h b/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
index 2757b91..4e25589 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
@@ -22,8 +22,8 @@
  * @file caleutils.h
  * @brief This file contains the APIs for BT LE communications.
  */
-#ifndef CA_LEUTILES_H_
-#define CA_LEUTILES_H_
+#ifndef CA_LE_UTILS_H_
+#define CA_LE_UTILS_H_
 
 #include "cacommon.h"
 #include "cathreadpool.h"
@@ -126,4 +126,4 @@ jstring CALEGetAddressFromBTDevice(JNIEnv *env, jobject bluetoothDevice);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_LE_UTILS_H_ */

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h b/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h
index 1fa94d6..60e19b2 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h
@@ -27,8 +27,8 @@
  * notifying the change of characteristcs for the request will be done here.
  */
 
-#ifndef _BLE_ADAPTER_ARDUINO_H_
-#define _BLE_ADAPTER_ARDUINO_H_
+#ifndef BLE_ADAPTER_ARDUINO_H_
+#define BLE_ADAPTER_ARDUINO_H_
 
 #include "cacommon.h"
 #include "caadapterinterface.h"
@@ -89,5 +89,5 @@ CAResult_t CABleDoEvents();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef _BLE_ADAPTER_ARDUINO_H_
+#endif /* BLE_ADAPTER_ARDUINO_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h
index ef5056c..35d40fc 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h
@@ -28,8 +28,8 @@
  * for the request and response will be done here.
  */
 
-#ifndef _BLE_CLIENT_
-#define _BLE_CLIENT_
+#ifndef TZ_BLE_CLIENT_H_
+#define TZ_BLE_CLIENT_H_
 
 #include <bluetooth.h>
 #include <bluetooth_type.h>
@@ -424,5 +424,5 @@ void CABleClientSenderQueueProcessor();
  */
 CAResult_t CALEReadDataFromLEClient();
 
-#endif //#ifndef _BLE_CLIENT_
+#endif /* TZ_BLE_CLIENT_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h
index 9d98e50..fc087ae 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h
@@ -28,8 +28,8 @@
  * LE adapter will interact with this sub module.
  */
 
-#ifndef __TZ_BLE_SERVER_H_
-#define __TZ_BLE_SERVER_H_
+#ifndef TZ_BLE_SERVER_H_
+#define TZ_BLE_SERVER_H_
 
 #include "caadapterinterface.h"
 #include "logger.h"
@@ -220,5 +220,5 @@ CAResult_t CABleServerSenderQueueEnqueueMessage
  */
 void *CABleServerSenderQueueProcessor();
 
-#endif //#ifndef __TZ_BLE_SERVER_H_
+#endif /* TZ_BLE_SERVER_H_ */
 

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h
index ce19d20..dc2882e 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h
@@ -29,8 +29,8 @@
  * is connected.
  */
 
-#ifndef _BLE_UTIL_H_
-#define _BLE_UTIL_H_
+#ifndef TZ_BLE_UTIL_H_
+#define TZ_BLE_UTIL_H_
 
 #include <bluetooth.h>
 
@@ -275,4 +275,4 @@ CAResult_t CAVerifyOICServiceByUUID(const char* serviceUUID);
  */
 const char *CABTGetErrorMsg(bt_error_e err);
 
-#endif //#ifndef _BLE_UTIL_H_
+#endif /* TZ_BLE_UTIL_H_ */

diff --git a/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h b/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
index dd02d31..c6b8213 100644 (file)
--- a/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
+++ b/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
@@ -75,6 +75,6 @@ CAResult_t CAArduinoInitMulticastUdpSocket(const char *mcastAddress,
 }
 #endif
 
-#endif //CA_ETHERNET_ADAPTER_UTILS_
+#endif /* CA_ETHERNET_ADAPTER_UTILS_ */