[asterisk-commits] branch group/new_loader_completion r23583 - in
/team/group/new_loader_complet...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Apr 30 04:48:51 MST 2006
Author: kpfleming
Date: Sun Apr 30 06:48:50 2006
New Revision: 23583
URL: http://svn.digium.com/view/asterisk?rev=23583&view=rev
Log:
manual merge with trunk
update CDR modules
Modified:
team/group/new_loader_completion/ (props changed)
team/group/new_loader_completion/Makefile
team/group/new_loader_completion/cdr/cdr_csv.c
team/group/new_loader_completion/cdr/cdr_custom.c
team/group/new_loader_completion/cdr/cdr_manager.c
team/group/new_loader_completion/editline/makelist
team/group/new_loader_completion/pbx/Makefile
team/group/new_loader_completion/utils/Makefile
Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 30 06:48:50 2006
@@ -1,1 +1,1 @@
-/trunk:1-23559
+/trunk:1-23582
Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sun Apr 30 06:48:50 2006
@@ -196,8 +196,9 @@
endif
ASTCFLAGS+=$(MENUSELECT_CFLAGS)
-TOPDIR_CFLAGS=-include include/autoconfig.h
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h
+TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
# *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename]
@@ -252,7 +253,6 @@
ID=/usr/xpg4/bin/id
endif
-INCLUDE+=-Iinclude -I../include -I..
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE)
@@ -545,8 +545,8 @@
subdirs:
for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
- CFLAGS="$(ASTCFLAGS)" $(MAKE) -C utils
- CFLAGS="$(ASTCFLAGS) -include ../include/autoconfig.h" $(MAKE) -C agi
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
Modified: team/group/new_loader_completion/cdr/cdr_csv.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_csv.c?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_csv.c (original)
+++ team/group/new_loader_completion/cdr/cdr_csv.c Sun Apr 30 06:48:50 2006
@@ -88,8 +88,6 @@
"uniqueid", unique call identifier
"userfield" user field set via SetCDRUserField
----------------------------------------------------------*/
-
-static char *desc = "Comma Separated Values CDR Backend";
static char *name = "csv";
@@ -311,12 +309,7 @@
return 0;
}
-static const char *description(void)
-{
- return desc;
-}
-
-static int unload_module(void *mod)
+static int unload_module(void)
{
if (mf)
fclose(mf);
@@ -324,13 +317,13 @@
return 0;
}
-static int load_module(void *mod)
+static int load_module(void)
{
int res;
load_config();
- res = ast_cdr_register(name, desc, csv_log);
+ res = ast_cdr_register(name, "Comma Separated Values CDR Backend", csv_log);
if (res) {
ast_log(LOG_ERROR, "Unable to register CSV CDR handling\n");
if (mf)
@@ -339,15 +332,15 @@
return res;
}
-static int reload(void *mod)
+static int reload(void)
{
load_config();
- return 0;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
+
+ return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Comma Separated Values CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );
Modified: team/group/new_loader_completion/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_custom.c?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_custom.c (original)
+++ team/group/new_loader_completion/cdr/cdr_custom.c Sun Apr 30 06:48:50 2006
@@ -56,8 +56,6 @@
#define DATE_FORMAT "%Y-%m-%d %T"
AST_MUTEX_DEFINE_STATIC(lock);
-
-static char *desc = "Customizable Comma Separated Values CDR Backend";
static char *name = "cdr-custom";
@@ -137,12 +135,7 @@
return 0;
}
-static const char *description(void)
-{
- return desc;
-}
-
-static int unload_module(void *mod)
+static int unload_module(void)
{
if (mf)
fclose(mf);
@@ -150,12 +143,12 @@
return 0;
}
-static int load_module(void *mod)
+static int load_module(void)
{
int res = 0;
if (!load_config(0)) {
- res = ast_cdr_register(name, desc, custom_log);
+ res = ast_cdr_register(name, "Customizable Comma Separated Values CDR Backend", custom_log);
if (res)
ast_log(LOG_ERROR, "Unable to register custom CDR handling\n");
if (mf)
@@ -164,15 +157,14 @@
return res;
}
-static int reload(void *mod)
+static int reload(void)
{
return load_config(1);
}
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Customizable Comma Separated Values CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );
-STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
-
Modified: team/group/new_loader_completion/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_manager.c?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_manager.c (original)
+++ team/group/new_loader_completion/cdr/cdr_manager.c Sun Apr 30 06:48:50 2006
@@ -45,7 +45,6 @@
#define DATE_FORMAT "%Y-%m-%d %T"
#define CONF_FILE "cdr_manager.conf"
-static char *desc = "Asterisk Call Manager CDR Backend";
static char *name = "cdr_manager";
static int enablecdr = 0;
@@ -135,25 +134,20 @@
return 0;
}
-static const char *description(void)
-{
- return desc;
-}
-
-static int unload_module(void *mod)
+static int unload_module(void)
{
ast_cdr_unregister(name);
return 0;
}
-static int load_module(void *mod)
+static int load_module(void)
{
int res;
/* Configuration file */
loadconfigurationfile();
- res = ast_cdr_register(name, desc, manager_log);
+ res = ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log);
if (res) {
ast_log(LOG_ERROR, "Unable to register Asterisk Call Manager CDR handling\n");
}
@@ -161,15 +155,14 @@
return res;
}
-static int reload(void *mod)
+static int reload(void)
{
loadconfigurationfile();
return 0;
}
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Asterisk Manager Interface CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );
Modified: team/group/new_loader_completion/editline/makelist
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/editline/makelist?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/editline/makelist (original)
+++ team/group/new_loader_completion/editline/makelist Sun Apr 30 06:48:50 2006
@@ -145,7 +145,7 @@
#
-fh)
cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
- sort | tr '[a-z]' '[A-Z]' | $AWK '
+ sort | tr '[:lower:]' '[:upper:]' | $AWK '
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
Modified: team/group/new_loader_completion/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/pbx/Makefile?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/pbx/Makefile (original)
+++ team/group/new_loader_completion/pbx/Makefile Sun Apr 30 06:48:50 2006
@@ -59,10 +59,10 @@
ael/aelbison.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -I. -c -o ael/aelbison.o ael/ael.tab.c
-ael/ael_lex.c: ael/ael.flex
+ael/ael_lex.c:
(cd ael; flex ael.flex)
-ael/ael.tab.c ael/ael.tab.h: ael/ael.y
+ael/ael.tab.c ael/ael.tab.h:
(cd ael; bison -v -d ael.y)
%.moc : %.h
Modified: team/group/new_loader_completion/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/utils/Makefile?rev=23583&r1=23582&r2=23583&view=diff
==============================================================================
--- team/group/new_loader_completion/utils/Makefile (original)
+++ team/group/new_loader_completion/utils/Makefile Sun Apr 30 06:48:50 2006
@@ -49,10 +49,10 @@
rm -f ast_expr2.o ast_expr2f.o
astman.o: astman.c
- $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $<
+ $(CC) $(CFLAGS) -c -o $@ $<
astman: astman.o ../md5.o
- $(CC) -D_GNU_SOURCE -o $@ $< ../md5.o -lnewt
+ $(CC) $(CFLAGS) -o $@ $< ../md5.o -lnewt
stereorize: stereorize.o frame.o
$(CC) $(CFLAGS) -o stereorize stereorize.o frame.o -lm
@@ -60,10 +60,10 @@
.PHONY: ../ast_expr2.c ../ast_expr2f.c ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o
ast_expr2.o: ../ast_expr2.c
- gcc $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $<
+ gcc $(CFLAGS) -c -o $@ $<
ast_expr2f.o: ../ast_expr2f.c
- gcc $(CFLAGS) -include ../include/autoconfig.h -c -DSTANDALONE -o $@ $<
+ gcc $(CFLAGS) -c -DSTANDALONE -o $@ $<
check_expr: check_expr.c ast_expr2.o ast_expr2f.o
$(CC) $(CFLAGS) -o $@ $^
@@ -72,7 +72,7 @@
$(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o
ael_main.o : ael_main.c ../include/asterisk/ael_structs.h
- $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -g -o ael_main.o ael_main.c
+ $(CC) $(CFLAGS) -c -g -o ael_main.o ael_main.c
ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c
@@ -85,7 +85,7 @@
./testexpr2s expr2.testinput
smsq.o: smsq.c
- $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $<
+ $(CC) $(CFLAGS) -c -o $@ $<
smsq: smsq.o
$(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt
More information about the asterisk-commits
mailing list