[asterisk-commits] branch group/new_loader_completion r31160 - /team/group/new_loader_completion...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed May 31 16:43:20 2006
New Revision: 31160

URL: http://svn.digium.com/view/asterisk?rev=31160&view=rev
Log:
get app_rpt to build again

Modified:
    team/group/new_loader_completion/apps/Makefile
    team/group/new_loader_completion/apps/app_rpt.c

Modified: team/group/new_loader_completion/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/Makefile?rev=31160&r1=31159&r2=31160&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/Makefile (original)
+++ team/group/new_loader_completion/apps/Makefile Wed May 31 16:43:20 2006
@@ -39,7 +39,7 @@
 	$(CC) $(SOLINK) -o $@ $^ $(ZAPTEL_LIB)
 
 app_rpt.o: app_rpt.c
-	$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $^
+	$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
 
 install: all
 	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done

Modified: team/group/new_loader_completion/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_rpt.c?rev=31160&r1=31159&r2=31160&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_rpt.c (original)
+++ team/group/new_loader_completion/apps/app_rpt.c Wed May 31 16:43:20 2006
@@ -282,6 +282,9 @@
 "            available to the phone user.\n"
 "\n";
 
+static unsigned int vmajor = 0;
+static unsigned int vminor = 47;
+
 static int debug = 0;  /* FIXME Set this >0 for extra debug output */
 static int nrpts = 0;
 
@@ -1957,7 +1960,6 @@
 struct	rpt *myrpt;
 struct	rpt_link *l,*m,linkbase;
 struct	ast_channel *mychannel;
-int vmajor, vminor;
 char *p,*ct,*ct_copy,*ident, *nodename;
 time_t t;
 struct tm localtm;
@@ -2451,11 +2453,6 @@
 		imdone = 1;
 	    	break;
 	    case STATS_VERSION:
-		p = strstr(tdesc, "version");	
-		if(!p)
-			break;	
-		if(sscanf(p, "version %d.%d", &vmajor, &vminor) != 2)
-			break;
     		wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
 		/* Say "version" */
 		if (sayfile(mychannel,"rpt/version") == -1)