[sr-dev] git:5.2:6e1f8128: dispatcher: rename internal functions to match the module pattern

Daniel-Constantin Mierla miconda at gmail.com
Tue Dec 4 09:11:22 CET 2018


Module: kamailio
Branch: 5.2
Commit: 6e1f8128ce5e6ad5946644920ab9ea41bbdd224c
URL: https://github.com/kamailio/kamailio/commit/6e1f8128ce5e6ad5946644920ab9ea41bbdd224c

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2018-12-04T09:06:22+01:00

dispatcher: rename internal functions to match the module pattern

(cherry picked from commit 4e7e355db6946850bec061ef4d113bd8b9505cb7)

---

Modified: src/modules/dispatcher/dispatch.c
Modified: src/modules/dispatcher/dispatch.h
Modified: src/modules/dispatcher/dispatcher.c

---

Diff:  https://github.com/kamailio/kamailio/commit/6e1f8128ce5e6ad5946644920ab9ea41bbdd224c.diff
Patch: https://github.com/kamailio/kamailio/commit/6e1f8128ce5e6ad5946644920ab9ea41bbdd224c.patch

---

diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c
index d247d6e104..cb8fe6ea81 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -213,7 +213,7 @@ int ds_log_sets(void)
 /**
  *
  */
-int init_data(void)
+int ds_init_data(void)
 {
 	int *p;
 
@@ -864,7 +864,7 @@ void ds_disconnect_db(void)
 }
 
 /*! \brief Initialize and verify DB stuff*/
-int init_ds_db(void)
+int ds_init_db(void)
 {
 	int ret;
 
diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h
index 14db0e2a30..0675b3ccd3 100644
--- a/src/modules/dispatcher/dispatch.h
+++ b/src/modules/dispatcher/dispatch.h
@@ -114,8 +114,8 @@ extern str ds_outbound_proxy;
 extern str ds_default_socket;
 extern struct socket_info *ds_default_sockinfo;
 
-int init_data(void);
-int init_ds_db(void);
+int ds_init_data(void);
+int ds_init_db(void);
 int ds_load_list(char *lfile);
 int ds_connect_db(void);
 void ds_disconnect_db(void);
diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c
index 66ed3248ef..d18652a05f 100644
--- a/src/modules/dispatcher/dispatcher.c
+++ b/src/modules/dispatcher/dispatcher.c
@@ -349,7 +349,7 @@ static int mod_init(void)
 				ds_default_socket.len, ds_default_socket.s);
 	}
 
-	if(init_data() != 0)
+	if(ds_init_data() != 0)
 		return -1;
 
 	if(ds_db_url.s) {
@@ -369,7 +369,7 @@ static int mod_init(void)
 				}
 			}
 		}
-		if(init_ds_db() != 0) {
+		if(ds_init_db() != 0) {
 			LM_ERR("could not initiate a connect to the database\n");
 			return -1;
 		}




More information about the sr-dev mailing list