[asterisk-commits] branch kpfleming/stringfields - r7757 in /team/kpfleming/stringfields: ./ inc...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan  3 18:28:56 2006
New Revision: 7757

URL: http://svn.digium.com/view/asterisk?rev=7757&view=rev
Log:
more fixes

Modified:
    team/kpfleming/stringfields/astmm.c
    team/kpfleming/stringfields/include/asterisk/astmm.h
    team/kpfleming/stringfields/include/asterisk/stringfields.h

Modified: team/kpfleming/stringfields/astmm.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/stringfields/astmm.c?rev=7757&r1=7756&r2=7757&view=diff
==============================================================================
--- team/kpfleming/stringfields/astmm.c (original)
+++ team/kpfleming/stringfields/astmm.c Tue Jan  3 18:28:56 2006
@@ -255,7 +255,7 @@
 	return ptr;
 }
 
-int __ast_asprintf(char **strp, const char *file, int lineno, const char *func, const char *fmt, ...)
+int __ast_asprintf(const char *file, int lineno, const char *func, char **strp, const char *fmt, ...)
 {
 	int size;
 	va_list ap, ap2;

Modified: team/kpfleming/stringfields/include/asterisk/astmm.h
URL: http://svn.digium.com/view/asterisk/team/kpfleming/stringfields/include/asterisk/astmm.h?rev=7757&r1=7756&r2=7757&view=diff
==============================================================================
--- team/kpfleming/stringfields/include/asterisk/astmm.h (original)
+++ team/kpfleming/stringfields/include/asterisk/astmm.h Tue Jan  3 18:28:56 2006
@@ -73,7 +73,7 @@
 	__ast_strndup(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 #define asprintf(a, b, c...) \
-	__ast_asprintf(a, __FILE__, __LINE__, __PRETTY_FUNCTION__, b, c)
+	__ast_asprintf(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, b, c)
 
 #define vasprintf(a,b,c) \
 	__ast_vasprintf(a,b,c,__FILE__, __LINE__, __PRETTY_FUNCTION__)

Modified: team/kpfleming/stringfields/include/asterisk/stringfields.h
URL: http://svn.digium.com/view/asterisk/team/kpfleming/stringfields/include/asterisk/stringfields.h?rev=7757&r1=7756&r2=7757&view=diff
==============================================================================
--- team/kpfleming/stringfields/include/asterisk/stringfields.h (original)
+++ team/kpfleming/stringfields/include/asterisk/stringfields.h Tue Jan  3 18:28:56 2006
@@ -45,14 +45,14 @@
 
 #define ast_string_field_set(x, field, data) do { \
 	if (x->field) \
-		free((char *) x->field); \	
+		free((char *) x->field); \
 	x->field = strdup(data); \
 	} while (0)
 
 #define ast_string_field_build(x, field, fmt, args...) do { \
 	if (x->field) \
-		free((char *) x->field); \	
-	 asprintf((char **) &x->field, fmt, args); \
+		free((char *) x->field); \
+	asprintf((char **) &x->field, fmt, args); \
 	} while (0)
 
 #define ast_string_field_free(x, field) do { \