[svn-commits] russell: branch russell/iax_refcount r79560 - in /team/russell/iax_refcount: ...

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Aug 15 10:08:17 2007
New Revision: 79560

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79560
Log:
Bring in astobj2 from team/rizzo/astobj2

Added:
    team/russell/iax_refcount/include/asterisk/astobj2.h
      - copied unchanged from r79559, team/rizzo/astobj2/include/asterisk/astobj2.h
    team/russell/iax_refcount/main/astobj2.c
      - copied, changed from r79559, team/rizzo/astobj2/main/astobj2.c
Modified:
    team/russell/iax_refcount/main/Makefile

Modified: team/russell/iax_refcount/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/iax_refcount/main/Makefile?view=diff&rev=79560&r1=79559&r2=79560
==============================================================================
--- team/russell/iax_refcount/main/Makefile (original)
+++ team/russell/iax_refcount/main/Makefile Wed Aug 15 10:08:17 2007
@@ -26,7 +26,7 @@
 	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
 	cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
-	strcompat.o threadstorage.o dial.o
+	strcompat.o threadstorage.o dial.o astobj2.o
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static

Copied: team/russell/iax_refcount/main/astobj2.c (from r79559, team/rizzo/astobj2/main/astobj2.c)
URL: http://svn.digium.com/view/asterisk/team/russell/iax_refcount/main/astobj2.c?view=diff&rev=79560&p1=team/rizzo/astobj2/main/astobj2.c&r1=79559&p2=team/russell/iax_refcount/main/astobj2.c&r2=79560
==============================================================================
--- team/rizzo/astobj2/main/astobj2.c (original)
+++ team/russell/iax_refcount/main/astobj2.c Wed Aug 15 10:08:17 2007
@@ -679,40 +679,10 @@
 	return 0;
 }
 
-#if 1
-static char *test_new_cli(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "astobj2 foo bar";
-		e->usage = "this is the usage string for astobj2 foo bar <n>\n";
-		return NULL;
-
-	case CLI_GENERATE:
-		if (a->pos > e->args)	/* only extend one word */
-			return NULL;
-		if (a->n < 10) {
-			char *buf;
-			asprintf(&buf, "%d", a->n);
-			return buf;
-		}
-		return NULL;
-
-	default:	/* regular handler */
-		/* we are guaranteed to be called with argc >= e->args; */
-		if (a->argc > e->args + 1)	/* we only accept one extra field */
-			return CLI_SHOWUSAGE;
-	        ast_cli(a->fd, "this is test_new_cli %d for [%d] %s\n", a->argc, e->args, e->_full_cmd);
-		return CLI_SUCCESS;
-	}
-}
-#endif
-
 static struct ast_cli_entry cli_astobj2[] = {
 	{ { "astobj2", "stats", NULL },
 	handle_astobj2_stats, "Print astobj2 statistics", },
 	{ { "astobj2", "test", NULL } , handle_astobj2_test, "Test astobj2", },
-	NEW_CLI(test_new_cli, "sample new-cli command"),
 };
 
 int astobj2_init(void);