[svn-commits] rmudgett: branch group/issue8824 r146197 - in /team/group/issue8824: apps/ main/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Oct  3 16:50:39 2008
New Revision: 146197

URL: http://svn.digium.com/view/asterisk?view=rev&rev=146197
Log:
Made sure that S_REPLACE() is defined identically

Modified:
    team/group/issue8824/apps/app_dial.c
    team/group/issue8824/main/dial.c

Modified: team/group/issue8824/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_dial.c?view=diff&rev=146197&r1=146196&r2=146197
==============================================================================
--- team/group/issue8824/apps/app_dial.c (original)
+++ team/group/issue8824/apps/app_dial.c Fri Oct  3 16:50:39 2008
@@ -406,12 +406,13 @@
 	}
 }
 
-/* free the buffer if allocated, and set the pointer to the second arg */
-#define S_REPLACE(s, new_val)		\
-	do {				\
-		if (s)			\
-			ast_free(s);	\
-		s = (new_val);		\
+/*! \brief free the buffer if allocated, and set the pointer to the second arg */
+#define S_REPLACE(s, new_val) \
+	do {                      \
+		if (s) {              \
+			ast_free(s);      \
+		}                     \
+		s = (new_val);        \
 	} while (0)
 
 static int onedigit_goto(struct ast_channel *chan, const char *context, char exten, int pri)

Modified: team/group/issue8824/main/dial.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/dial.c?view=diff&rev=146197&r1=146196&r2=146197
==============================================================================
--- team/group/issue8824/main/dial.c (original)
+++ team/group/issue8824/main/dial.c Fri Oct  3 16:50:39 2008
@@ -177,7 +177,7 @@
 #define S_REPLACE(s, new_val) \
 	do {                      \
 		if (s) {              \
-			free(s);          \
+			ast_free(s);      \
 		}                     \
 		s = (new_val);        \
 	} while (0)