cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16728 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 90554d445667c3dbdcf1231658450bca9a108778..cb38449ecc8f08ec5cad1700a94b1aaaa53a1aa8 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -4303,7 +4303,10 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
        char recovery_sql[] =
                "CREATE TABLE sip_recovery (\n"
                "   runtime_uuid    VARCHAR(255),\n"
-               "   profile_name    VARCHAR(255),\n" "   hostname        VARCHAR(255),\n" "   uuid            VARCHAR(255),\n" "   metadata        text\n" ");\n";
+               "   profile_name    VARCHAR(255),\n"
+               "   hostname        VARCHAR(255),\n"
+               "   uuid            VARCHAR(255),\n"
+               "   metadata        text\n" ");\n";
 
        char pres_sql[] =
                "CREATE TABLE sip_presence (\n"
@@ -4314,7 +4317,10 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                "   expires         INTEGER,\n"
                "   user_agent      VARCHAR(255),\n"
                "   profile_name    VARCHAR(255),\n"
-               "   hostname        VARCHAR(255),\n" "   network_ip      VARCHAR(255),\n" "   network_port    VARCHAR(6)\n" ");\n";
+               "   hostname        VARCHAR(255),\n"
+               "   network_ip      VARCHAR(255),\n"
+               "   network_port    VARCHAR(6)\n"
+               ");\n";
 
        char dialog_sql[] =
                "CREATE TABLE sip_dialogs (\n"
@@ -4334,7 +4340,10 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                "   contact         VARCHAR(255),\n"
                "   presence_id     VARCHAR(255),\n"
                "   presence_data   VARCHAR(255),\n"
-               "   call_info       VARCHAR(255),\n" "   call_info_state VARCHAR(255),\n" "   expires         INTEGER default 0\n" ");\n";
+               "   call_info       VARCHAR(255),\n"
+               "   call_info_state VARCHAR(255),\n"
+               "   expires         INTEGER default 0\n"
+               ");\n";
 
        char sub_sql[] =
                "CREATE TABLE sip_subscriptions (\n"
@@ -4353,12 +4362,19 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                "   user_agent      VARCHAR(255),\n"
                "   accept          VARCHAR(255),\n"
                "   profile_name    VARCHAR(255),\n"
-               "   hostname        VARCHAR(255),\n" "   network_port    VARCHAR(6),\n" "   network_ip      VARCHAR(255)\n" ");\n";
+               "   hostname        VARCHAR(255),\n"
+               "   network_port    VARCHAR(6),\n"
+               "   network_ip      VARCHAR(255)\n"
+               ");\n";
 
        char auth_sql[] =
                "CREATE TABLE sip_authentication (\n"
                "   nonce           VARCHAR(255),\n"
-               "   expires         INTEGER," "   profile_name    VARCHAR(255),\n" "   hostname        VARCHAR(255),\n" "   last_nc         INTEGER\n" ");\n";
+               "   expires         INTEGER,"
+               "   profile_name    VARCHAR(255),\n"
+               "   hostname        VARCHAR(255),\n"
+               "   last_nc         INTEGER\n"
+               ");\n";
 
        /* should we move this glue to sofia_sla or keep it here where all db init happens? XXX MTK */
        char shared_appearance_sql[] =
@@ -4367,14 +4383,20 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                "   call_id           VARCHAR(255),\n"
                "   aor               VARCHAR(255),\n"
                "   profile_name      VARCHAR(255),\n"
-               "   hostname          VARCHAR(255),\n" "   contact_str       VARCHAR(255),\n" "   network_ip        VARCHAR(255)\n" ");\n";
+               "   hostname          VARCHAR(255),\n"
+               "   contact_str       VARCHAR(255),\n"
+               "   network_ip        VARCHAR(255)\n"
+               ");\n";
 
        char shared_appearance_dialogs_sql[] =
                "CREATE TABLE sip_shared_appearance_dialogs (\n"
                "   profile_name      VARCHAR(255),\n"
                "   hostname          VARCHAR(255),\n"
                "   contact_str       VARCHAR(255),\n"
-               "   call_id           VARCHAR(255),\n" "   network_ip        VARCHAR(255),\n" "   expires           INTEGER\n" ");\n";
+               "   call_id           VARCHAR(255),\n"
+               "   network_ip        VARCHAR(255),\n"
+               "   expires           INTEGER\n"
+               ");\n";
 
        if (switch_odbc_available() && profile->odbc_dsn) {
                int x;

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 2a78282e07736fa9281f31f47307bb5e88c342b0..0d6ac3d15e3741540c7687a3d78335b2c26b6354 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1152,10 +1152,20 @@ static char create_complete_sql[] =
        "   a4  VARCHAR(128),\n"
        "   a5  VARCHAR(128),\n"
        "   a6  VARCHAR(128),\n"
-       "   a7  VARCHAR(128),\n" "   a8  VARCHAR(128),\n" "   a9  VARCHAR(128),\n" "   a10 VARCHAR(128),\n" "   hostname VARCHAR(256)\n" ");\n";
+       "   a7  VARCHAR(128),\n"
+       "   a8  VARCHAR(128),\n"
+       "   a9  VARCHAR(128),\n"
+       "   a10 VARCHAR(128),\n"
+       "   hostname VARCHAR(256)\n"
+       ");\n";
 
 static char create_alias_sql[] =
-       "CREATE TABLE aliases (\n" "   sticky  INTEGER,\n" "   alias  VARCHAR(128),\n" "   command  VARCHAR(4096),\n" "   hostname VARCHAR(256)\n" ");\n";
+       "CREATE TABLE aliases (\n"
+       "   sticky  INTEGER,\n"
+       "   alias  VARCHAR(128),\n"
+       "   command  VARCHAR(4096),\n"
+       "   hostname VARCHAR(256)\n"
+       ");\n";
 
 static char create_channels_sql[] =
        "CREATE TABLE channels (\n"
@@ -1179,7 +1189,10 @@ static char create_channels_sql[] =
        "   write_rate  VARCHAR(32),\n"
        "   secure VARCHAR(32),\n"
        "   hostname VARCHAR(256),\n"
-       "   presence_id VARCHAR(4096),\n" "   presence_data VARCHAR(4096)\n" ");\ncreate index uuindex on channels (uuid,hostname);\n";
+       "   presence_id VARCHAR(4096),\n"
+       "   presence_data VARCHAR(4096)\n"
+       ");\ncreate index uuindex on channels (uuid,hostname);\n";
+
 static char create_calls_sql[] =
        "CREATE TABLE calls (\n"
        "   call_created  VARCHAR(128),\n"
@@ -1197,20 +1210,34 @@ static char create_calls_sql[] =
        "   callee_uuid      VARCHAR(256),\n"
        "   hostname VARCHAR(256)\n"
        ");\n" "create index eruuindex on calls (caller_uuid,hostname);\n" "create index eeuuindex on calls (callee_uuid,hostname);\n";
+
 static char create_interfaces_sql[] =
        "CREATE TABLE interfaces (\n"
        "   type             VARCHAR(128),\n"
        "   name             VARCHAR(1024),\n"
        "   description      VARCHAR(4096),\n"
        "   ikey             VARCHAR(1024),\n"
-       "   filename         VARCHAR(4096),\n" "   syntax           VARCHAR(4096),\n" "   hostname VARCHAR(256)\n" ");\n";
+       "   filename         VARCHAR(4096),\n"
+       "   syntax           VARCHAR(4096),\n"
+       "   hostname VARCHAR(256)\n"
+       ");\n";
+
 static char create_tasks_sql[] =
        "CREATE TABLE tasks (\n"
        "   task_id             INTEGER,\n"
        "   task_desc           VARCHAR(4096),\n"
-       "   task_group          VARCHAR(1024),\n" "   task_sql_manager    INTEGER,\n" "   hostname VARCHAR(256)\n" ");\n";
+       "   task_group          VARCHAR(1024),\n"
+       "   task_sql_manager    INTEGER,\n"
+       "   hostname VARCHAR(256)\n"
+       ");\n";
+
 static char create_nat_sql[] =
-       "CREATE TABLE nat (\n" "   sticky  INTEGER,\n" "        port    INTEGER,\n" "   proto   INTEGER,\n" "   hostname VARCHAR(256)\n" ");\n";
+       "CREATE TABLE nat (\n"
+       "   sticky  INTEGER,\n"
+       "       port    INTEGER,\n"
+       "       proto   INTEGER,\n"
+       "   hostname VARCHAR(256)\n"
+       ");\n";
 
 switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_t manage)
 {