pua_json: clang-format for coherent indentation and coding style

kamailio · May 18, 2023 · 7a83635 · 7a83635
1 parent 8966ab9
commit 7a83635
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 98 deletions.
diff --git a/src/modules/pua_json/defs.h b/src/modules/pua_json/defs.h
@@ -26,45 +26,45 @@
 #define _PUA_JSON_DEFS_H_
 
 #define BLF_MAX_DIALOGS 8
-#define BLF_JSON_PRES		"Presentity"
-#define BLF_JSON_PRES_USER	"Presentity-User"
-#define BLF_JSON_PRES_REALM	"Presentity-Realm"
-#define BLF_JSON_FROM      	"From"
-#define BLF_JSON_FROM_USER 	"From-User"
-#define BLF_JSON_FROM_REALM	"From-Realm"
-#define BLF_JSON_FROM_URI	"From-URI"
-#define BLF_JSON_TO        	"To"
-#define BLF_JSON_TO_USER 	"To-User"
-#define BLF_JSON_TO_REALM	"To-Realm"
-#define BLF_JSON_TO_URI		"To-URI"
-#define BLF_JSON_CALLID    	"Call-ID"
-#define BLF_JSON_TOTAG     	"To-Tag"
-#define BLF_JSON_FROMTAG   	"From-Tag"
-#define BLF_JSON_STATE     	"State"
-#define BLF_JSON_USER      	"User"
-#define BLF_JSON_QUEUE     	"Queue"
-#define BLF_JSON_EXPIRES	"Expires"
-#define BLF_JSON_APP_NAME       "App-Name"
-#define BLF_JSON_APP_VERSION    "App-Version"
-#define BLF_JSON_NODE           "Node"
-#define BLF_JSON_SERVERID       "Server-ID"
+#define BLF_JSON_PRES "Presentity"
+#define BLF_JSON_PRES_USER "Presentity-User"
+#define BLF_JSON_PRES_REALM "Presentity-Realm"
+#define BLF_JSON_FROM "From"
+#define BLF_JSON_FROM_USER "From-User"
+#define BLF_JSON_FROM_REALM "From-Realm"
+#define BLF_JSON_FROM_URI "From-URI"
+#define BLF_JSON_TO "To"
+#define BLF_JSON_TO_USER "To-User"
+#define BLF_JSON_TO_REALM "To-Realm"
+#define BLF_JSON_TO_URI "To-URI"
+#define BLF_JSON_CALLID "Call-ID"
+#define BLF_JSON_TOTAG "To-Tag"
+#define BLF_JSON_FROMTAG "From-Tag"
+#define BLF_JSON_STATE "State"
+#define BLF_JSON_USER "User"
+#define BLF_JSON_QUEUE "Queue"
+#define BLF_JSON_EXPIRES "Expires"
+#define BLF_JSON_APP_NAME "App-Name"
+#define BLF_JSON_APP_VERSION "App-Version"
+#define BLF_JSON_NODE "Node"
+#define BLF_JSON_SERVERID "Server-ID"
 #define BLF_JSON_EVENT_CATEGORY "Event-Category"
-#define BLF_JSON_EVENT_NAME     "Event-Name"
-#define BLF_JSON_TYPE           "Type"
-#define BLF_JSON_MSG_ID         "Msg-ID"
-#define BLF_JSON_DIRECTION      "Direction"
+#define BLF_JSON_EVENT_NAME "Event-Name"
+#define BLF_JSON_TYPE "Type"
+#define BLF_JSON_MSG_ID "Msg-ID"
+#define BLF_JSON_DIRECTION "Direction"
 
-#define BLF_JSON_CONTACT   	"Contact"
-#define BLF_JSON_EVENT_PKG      "Event-Package"
-#define MWI_JSON_WAITING        "Messages-Waiting"
-#define MWI_JSON_VOICE_MESSAGE  "MWI-Voice-Message"
-#define MWI_JSON_NEW            "Messages-New"
-#define MWI_JSON_SAVED          "Messages-Saved"
-#define MWI_JSON_URGENT         "Messages-Urgent"
-#define MWI_JSON_URGENT_SAVED   "Messages-Urgent-Saved"
-#define MWI_JSON_ACCOUNT        "Message-Account"
-#define MWI_JSON_FROM      	"From"
-#define MWI_JSON_TO        	"To"
+#define BLF_JSON_CONTACT "Contact"
+#define BLF_JSON_EVENT_PKG "Event-Package"
+#define MWI_JSON_WAITING "Messages-Waiting"
+#define MWI_JSON_VOICE_MESSAGE "MWI-Voice-Message"
+#define MWI_JSON_NEW "Messages-New"
+#define MWI_JSON_SAVED "Messages-Saved"
+#define MWI_JSON_URGENT "Messages-Urgent"
+#define MWI_JSON_URGENT_SAVED "Messages-Urgent-Saved"
+#define MWI_JSON_ACCOUNT "Message-Account"
+#define MWI_JSON_FROM "From"
+#define MWI_JSON_TO "To"
 
 #define TO_TAG_BUFFER_SIZE 128
 #define FROM_TAG_BUFFER_SIZE 128
@@ -73,10 +73,16 @@
 #define MWI_BODY_BUFFER_SIZE 2048
 #define PRESENCE_BODY_BUFFER_SIZE 4096
 
-#define MWI_BODY_VOICE_MESSAGE "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s\r\n"
-#define MWI_BODY_NO_VOICE_MESSAGE "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\n"
-#define MWI_BODY             "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s/%.*s (%.*s/%.*s)\r\n"
-#define PRESENCE_BODY        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+#define MWI_BODY_VOICE_MESSAGE                                           \
+	"Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: " \
+	"%.*s\r\n"
+#define MWI_BODY_NO_VOICE_MESSAGE \
+	"Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\n"
+#define MWI_BODY                                                         \
+	"Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: " \
+	"%.*s/%.*s (%.*s/%.*s)\r\n"
+#define PRESENCE_BODY \
+	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
 <presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%s\"> \
 <tuple xmlns=\"urn:ietf:params:xml:ns:pidf\" id=\"%s\">\
 <status>\
@@ -90,7 +96,8 @@
 </dm:person>\
 </presence>"
 
-#define DIALOGINFO_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+#define DIALOGINFO_EMPTY_BODY \
+	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
 <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\"> \
 <dialog call-id=\"76001e23e09704ea9e1257ebea85e1f3\" direction=\"initiator\">\
 <state>terminated</state>\
@@ -100,7 +107,8 @@
 #define LOCAL_TAG "local-tag=\"%.*s\""
 #define REMOTE_TAG "remote-tag=\"%.*s\""
 
-#define DIALOGINFO_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+#define DIALOGINFO_BODY \
+	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
 <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\
 <dialog id=\"%.*s\" call-id=\"%.*s\" %.*s %.*s direction=\"%.*s\">\
 <state>%.*s</state>\
@@ -115,7 +123,8 @@
 </dialog>\
 </dialog-info>"
 
-#define DIALOGINFO_BODY_2 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+#define DIALOGINFO_BODY_2 \
+	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
 <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\
 <dialog id=\"%.*s\" call-id=\"%.*s\" %.*s %.*s direction=\"%.*s\">\
 <state>%.*s</state>\

diff --git a/src/modules/pua_json/pua_json_mod.c b/src/modules/pua_json/pua_json_mod.c
@@ -80,7 +80,7 @@ static int mod_init(void)
 /**
  *
  */
-static int ki_pua_json_publish(sip_msg_t* msg, str* pjson)
+static int ki_pua_json_publish(sip_msg_t *msg, str *pjson)
 {
 	return pua_json_publish(msg, pjson->s);
 }
@@ -92,7 +92,7 @@ static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2)
 {
 	str pjson = STR_NULL;
 
-	if(fixup_get_svalue(msg, (gparam_t*)p1pjson, &pjson)<0) {
+	if(fixup_get_svalue(msg, (gparam_t *)p1pjson, &pjson) < 0) {
 		LM_ERR("failed to get p1 value\n");
 		return -1;
 	}