Commit 0734f2d4 authored by jnashok's avatar jnashok Committed by Erich Keane

Removing Single/Double underscores at beginning of the preprocessor directives

Change-Id: I7fcb060f9a2db955032768d4c8417c920a90299f
Signed-off-by: default avatarjnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/994Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarJohn Light <john.j.light@intel.com>
Reviewed-by: default avatarErich Keane <erich.keane@intel.com>
parent ac8ffa40
......@@ -337,5 +337,5 @@ typedef struct
} /* extern "C" */
#endif
#endif //#ifndef CA_COMMON_H_
#endif /* CA_COMMON_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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -179,5 +179,5 @@ typedef void (*CANetworkChangeCallback)(CALocalConnectivity_t *info, CANetworkSt
} /* extern "C" */
#endif
#endif // CA_ADAPTER_INTERFACE_H_
#endif /* CA_ADAPTER_INTERFACE_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_ */
......@@ -308,5 +308,5 @@ JavaVM *CANativeJNIGetJavaVM();
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif // CA_ADAPTER_UTILS_H_
#endif /* CA_ADAPTER_UTILS_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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -118,5 +118,5 @@ void CATerminateAdapters();
} /* extern "C" */
#endif
#endif //#ifndef CA_INTERFACE_CONTROLLER_H_
#endif /* CA_INTERFACE_CONTROLLER_H_ */
......@@ -127,5 +127,5 @@ CAResult_t CAReadData();
} /* extern "C" */
#endif
#endif //#ifndef __CA_INTERFACE_CONTROLLER_H_
#endif /* CA_INTERFACE_CONTROLLER_SINGLETHREAD_H_ */
......@@ -124,5 +124,5 @@ void CATerminateIP();
} /* extern "C" */
#endif
#endif // #ifndef CA_IP_ADAPTER_SINGLETHREAD_H_
#endif /* CA_IP_ADAPTER_SINGLETHREAD_H_ */
......@@ -325,4 +325,4 @@ void CAIPSetConnectionStateChangeCallback(CAIPConnectionStateChangeCallback call
}
#endif
#endif //CA_IP_INTERFACE_H_
#endif /* CA_IP_INTERFACE_H_ */
......@@ -303,5 +303,5 @@ void CAIPSetConnectionStateChangeCallback
}
#endif
#endif //CA_IP_INTERFACE_SINGLETHREAD_H_
#endif /* CA_IP_INTERFACE_SINGLETHREAD_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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -74,5 +74,5 @@ CAResult_t CATerminateNetworkType();
} /* extern "C" */
#endif
#endif //#ifndef NETWORK_CONFIGURATOR_H_
#endif /* NETWORK_CONFIGURATOR_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_ */
......@@ -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_ */
......@@ -100,5 +100,5 @@ void CADestroyResponseInfoInternal(CAResponseInfo_t *response);
} /* extern "C" */
#endif
#endif //#ifndef CA_REMOTE_HANDLER_H_
#endif /* CA_REMOTE_HANDLER_H_ */
......@@ -163,4 +163,4 @@ CAResult_t CARetransmissionDestroy(CARetransmission_t *context);
} /* extern "C" */
#endif
#endif // CA_RETRANSMISSION_H_
#endif /* CA_RETRANSMISSION_H_ */
......@@ -151,5 +151,5 @@ void CARetransmissionBaseRoutine(void *threadValue);
} /* extern "C" */
#endif
#endif // CA_RETRANSMISSION_SINGLETHREAD_H_
#endif /* CA_RETRANSMISSION_SINGLETHREAD_H_ */
......@@ -165,5 +165,5 @@ void CAEDRNativeSocketClose(JNIEnv *env, const char *address, uint32_t id);
} /* extern "C" */
#endif
#endif
#endif /* CA_EDR_CLIENT_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_ */
......@@ -138,5 +138,5 @@ void CAEDRNatvieCloseServerTask(JNIEnv* env);
} /* extern "C" */
#endif
#endif
#endif /* CA_EDR_SERVER_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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -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_ */
......@@ -594,4 +594,4 @@ void CALEClientSetTheSendRequestFlag(bool flag);
} /* extern "C" */
#endif
#endif
#endif /* CA_LECLIENT_H_ */
......@@ -59,5 +59,5 @@ void CALESetNetStateCallback(CALEDeviceStateChangedCallback callback);
} /* extern "C" */
#endif
#endif
#endif /* CA_LENWMONITOR_H_ */
......@@ -22,8 +22,8 @@
* @file caleutils.h
* @brief This file contains the APIs for BT LE communications.