[Asterisk-cvs] asterisk/apps app_db.c,1.5,1.6
citats at lists.digium.com
citats at lists.digium.com
Fri Jul 9 12:33:13 CDT 2004
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/home/citats/cvs/asterisk/apps
Modified Files:
app_db.c
Log Message:
Fixes from bkw_. Formatting in app_db.c and handle start right in cdr_pgsql.c
Index: app_db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_db.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- app_db.c 22 Jun 2004 19:32:52 -0000 1.5
+++ app_db.c 9 Jul 2004 16:19:00 -0000 1.6
@@ -30,21 +30,21 @@
static char *tdesc = "Database access functions for Asterisk extension logic";
static char *g_descrip =
- " DBget(varname=family/key): Retrieves a value from the Asterisk\n"
- "database and stores it in the given variable. Always returns 0. If the\n"
- "requested key is not found, jumps to priority n+101 if available.\n";
+ " DBget(varname=family/key): Retrieves a value from the Asterisk\n"
+ "database and stores it in the given variable. Always returns 0. If the\n"
+ "requested key is not found, jumps to priority n+101 if available.\n";
static char *p_descrip =
- " DBput(family/key=value): Stores the given value in the Asterisk\n"
- "database. Always returns 0.\n";
+ " DBput(family/key=value): Stores the given value in the Asterisk\n"
+ "database. Always returns 0.\n";
static char *d_descrip =
- " DBdel(family/key): Deletes a key from the Asterisk database. Always\n"
- "returns 0.\n";
+ " DBdel(family/key): Deletes a key from the Asterisk database. Always\n"
+ "returns 0.\n";
static char *dt_descrip =
- " DBdeltree(family[/keytree]): Deletes a family or keytree from the Asterisk\n"
- "database. Always returns 0.\n";
+ " DBdeltree(family[/keytree]): Deletes a family or keytree from the Asterisk\n"
+ "database. Always returns 0.\n";
static char *g_app = "DBget";
static char *p_app = "DBput";
@@ -60,255 +60,196 @@
LOCAL_USER_DECL;
-
-static int
-deltree_exec (struct ast_channel *chan, void *data)
+static int deltree_exec (struct ast_channel *chan, void *data)
{
- int arglen;
- char *argv, *family, *keytree;
+ int arglen;
+ char *argv, *family, *keytree;
- arglen = strlen (data);
- argv = alloca (arglen + 1);
- if (!argv) /* Why would this fail? */
- {
- ast_log (LOG_DEBUG, "Memory allocation failed\n");
- return 0;
- }
- memcpy (argv, data, arglen + 1);
+ arglen = strlen (data);
+ argv = alloca (arglen + 1);
+ if (!argv) { /* Why would this fail? */
+ ast_log (LOG_DEBUG, "Memory allocation failed\n");
+ return 0;
+ }
+ memcpy (argv, data, arglen + 1);
- if (strchr (argv, '/')) {
- {
- family = strsep (&argv, "/");
- keytree = strsep (&argv, "\0");
- if (!family || !keytree)
- {
- ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
- return 0;
+ if (strchr (argv, '/')) {
+ family = strsep (&argv, "/");
+ keytree = strsep (&argv, "\0");
+ if (!family || !keytree) {
+ ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+ return 0;
+ }
+ if (!strlen (keytree))
+ keytree = 0;
+ } else {
+ family = argv;
+ keytree = 0;
}
- if (!strlen (keytree))
- keytree = 0;
- }
- } else
- {
- family = argv;
- keytree = 0;
- }
- if (option_verbose > 2)
- {
- if (keytree)
- ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: family=%s, keytree=%s\n",
- family, keytree);
- else
- ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: family=%s\n", family);
- }
+ if (option_verbose > 2) {
+ if (keytree)
+ ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: family=%s, keytree=%s\n", family, keytree);
+ else
+ ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: family=%s\n", family);
+ }
- if (ast_db_deltree (family, keytree))
- {
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBdeltree: Error deleting key from database.\n");
- }
+ if (ast_db_deltree (family, keytree)) {
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: Error deleting key from database.\n");
+ }
- return 0;
+ return 0;
}
-
-static int
-del_exec (struct ast_channel *chan, void *data)
+static int del_exec (struct ast_channel *chan, void *data)
{
- int arglen;
- char *argv, *family, *key;
-
- arglen = strlen (data);
- argv = alloca (arglen + 1);
- if (!argv) /* Why would this fail? */
- {
- ast_log (LOG_DEBUG, "Memory allocation failed\n");
- return 0;
- }
- memcpy (argv, data, arglen + 1);
+ int arglen;
+ char *argv, *family, *key;
- if (strchr (argv, '/'))
- {
- family = strsep (&argv, "/");
- key = strsep (&argv, "\0");
- if (!family || !key)
- {
- ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
- return 0;
- }
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBdel: family=%s, key=%s\n", family, key);
- if (ast_db_del (family, key))
- {
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBdel: Error deleting key from database.\n");
+ arglen = strlen (data);
+ argv = alloca (arglen + 1);
+ if (!argv) { /* Why would this fail? */
+ ast_log (LOG_DEBUG, "Memory allocation failed\n");
+ return 0;
}
- }
- else
- {
- ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
- }
+ memcpy (argv, data, arglen + 1);
- return 0;
+ if (strchr (argv, '/')) {
+ family = strsep (&argv, "/");
+ key = strsep (&argv, "\0");
+ if (!family || !key) {
+ ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+ return 0;
+ }
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBdel: family=%s, key=%s\n", family, key);
+ if (ast_db_del (family, key)) {
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBdel: Error deleting key from database.\n");
+ }
+ } else {
+ ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
+ }
+ return 0;
}
-static int
-put_exec (struct ast_channel *chan, void *data)
+static int put_exec (struct ast_channel *chan, void *data)
{
- int arglen;
- char *argv, *value, *family, *key;
-
- arglen = strlen (data);
- argv = alloca (arglen + 1);
- if (!argv) /* Why would this fail? */
- {
- ast_log (LOG_DEBUG, "Memory allocation failed\n");
- return 0;
- }
- memcpy (argv, data, arglen + 1);
+ int arglen;
+ char *argv, *value, *family, *key;
- if (strchr (argv, '/') && strchr (argv, '='))
- {
- family = strsep (&argv, "/");
- key = strsep (&argv, "=");
- value = strsep (&argv, "\0");
- if (!value || !family || !key)
- {
- ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
- return 0;
- }
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBput: family=%s, key=%s, value=%s\n", family, key,
- value);
- if (ast_db_put (family, key, value))
- {
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBput: Error writing value to database.\n");
+ arglen = strlen (data);
+ argv = alloca (arglen + 1);
+ if (!argv) { /* Why would this fail? */
+ ast_log (LOG_DEBUG, "Memory allocation failed\n");
+ return 0;
}
+ memcpy (argv, data, arglen + 1);
- }
- else
- {
- ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
- }
+ if (strchr (argv, '/') && strchr (argv, '=')) {
+ family = strsep (&argv, "/");
+ key = strsep (&argv, "=");
+ value = strsep (&argv, "\0");
+ if (!value || !family || !key) {
+ ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+ return 0;
+ }
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBput: family=%s, key=%s, value=%s\n", family, key, value);
+ if (ast_db_put (family, key, value)) {
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBput: Error writing value to database.\n");
+ }
- return 0;
+ } else {
+ ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
+ }
+ return 0;
}
-static int
-get_exec (struct ast_channel *chan, void *data)
+static int get_exec (struct ast_channel *chan, void *data)
{
- int arglen;
- char *argv, *varname, *family, *key;
- char dbresult[256];
-
- arglen = strlen (data);
- argv = alloca (arglen + 1);
- if (!argv) /* Why would this fail? */
- {
- ast_log (LOG_DEBUG, "Memory allocation failed\n");
- return 0;
- }
- memcpy (argv, data, arglen + 1);
+ int arglen;
+ char *argv, *varname, *family, *key;
+ char dbresult[256];
- if (strchr (argv, '=') && strchr (argv, '/'))
- {
- varname = strsep (&argv, "=");
- family = strsep (&argv, "/");
- key = strsep (&argv, "\0");
- if (!varname || !family || !key)
- {
- ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
- return 0;
- }
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBget: varname=%s, family=%s, key=%s\n", varname,
- family, key);
- if (!ast_db_get (family, key, dbresult, sizeof (dbresult) - 1))
- {
- pbx_builtin_setvar_helper (chan, varname, dbresult);
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBget: set variable %s to %s\n", varname, dbresult);
- }
- else
- {
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
- "DBget: Value not found in database.\n");
- /* Send the call to n+101 priority, where n is the current priority */
- if (ast_exists_extension
- (chan, chan->context, chan->exten, chan->priority + 101,
- chan->callerid))
- chan->priority += 100;
+ arglen = strlen (data);
+ argv = alloca (arglen + 1);
+ if (!argv) { /* Why would this fail? */
+ ast_log (LOG_DEBUG, "Memory allocation failed\n");
+ return 0;
}
+ memcpy (argv, data, arglen + 1);
- }
- else
- {
- ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
- }
+ if (strchr (argv, '=') && strchr (argv, '/')) {
+ varname = strsep (&argv, "=");
+ family = strsep (&argv, "/");
+ key = strsep (&argv, "\0");
+ if (!varname || !family || !key) {
+ ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+ return 0;
+ }
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBget: varname=%s, family=%s, key=%s\n", varname, family, key);
+ if (!ast_db_get (family, key, dbresult, sizeof (dbresult) - 1)) {
+ pbx_builtin_setvar_helper (chan, varname, dbresult);
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBget: set variable %s to %s\n", varname, dbresult);
+ } else {
+ if (option_verbose > 2)
+ ast_verbose (VERBOSE_PREFIX_3 "DBget: Value not found in database.\n");
+ /* Send the call to n+101 priority, where n is the current priority */
+ if (ast_exists_extension (chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+ chan->priority += 100;
+ }
- return 0;
+ } else {
+ ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
+ }
+ return 0;
}
-int
-unload_module (void)
+int unload_module (void)
{
- int retval;
+ int retval;
- STANDARD_HANGUP_LOCALUSERS;
- retval = ast_unregister_application (dt_app);
- retval |= ast_unregister_application (d_app);
- retval |= ast_unregister_application (p_app);
- retval |= ast_unregister_application (g_app);
+ STANDARD_HANGUP_LOCALUSERS;
+ retval = ast_unregister_application (dt_app);
+ retval |= ast_unregister_application (d_app);
+ retval |= ast_unregister_application (p_app);
+ retval |= ast_unregister_application (g_app);
- return retval;
+ return retval;
}
-int
-load_module (void)
+int load_module (void)
{
- int retval;
-
- retval = ast_register_application (g_app, get_exec, g_synopsis, g_descrip);
- if (!retval)
- retval =
- ast_register_application (p_app, put_exec, p_synopsis, p_descrip);
- if (!retval)
- retval =
- ast_register_application (d_app, del_exec, d_synopsis, d_descrip);
- if (!retval)
- retval =
- ast_register_application (dt_app, deltree_exec, dt_synopsis,
- dt_descrip);
+ int retval;
- return retval;
+ retval = ast_register_application (g_app, get_exec, g_synopsis, g_descrip);
+ if (!retval)
+ retval = ast_register_application (p_app, put_exec, p_synopsis, p_descrip);
+ if (!retval)
+ retval = ast_register_application (d_app, del_exec, d_synopsis, d_descrip);
+ if (!retval)
+ retval = ast_register_application (dt_app, deltree_exec, dt_synopsis, dt_descrip);
+ return retval;
}
-char *
-description (void)
+char *description (void)
{
- return tdesc;
+ return tdesc;
}
-int
-usecount (void)
+int usecount (void)
{
- int res;
- STANDARD_USECOUNT (res);
- return res;
+ int res;
+ STANDARD_USECOUNT (res);
+ return res;
}
-char *
-key ()
+char *key ()
{
- return ASTERISK_GPL_KEY;
+ return ASTERISK_GPL_KEY;
}
More information about the svn-commits
mailing list