[asterisk-commits] oej: branch group/ami_ssl r48104 - in /team/group/ami_ssl: include/asterisk/ ...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Nov 29 00:15:50 2006
New Revision: 48104

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48104
Log:
And now - compile again

Modified:
    team/group/ami_ssl/include/asterisk/utils.h
    team/group/ami_ssl/res/res_agi.c

Modified: team/group/ami_ssl/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/team/group/ami_ssl/include/asterisk/utils.h?view=diff&rev=48104&r1=48103&r2=48104
==============================================================================
--- team/group/ami_ssl/include/asterisk/utils.h (original)
+++ team/group/ami_ssl/include/asterisk/utils.h Wed Nov 29 00:15:50 2006
@@ -246,10 +246,8 @@
 	it on a file descriptor that _DOES_ have NONBLOCK set.  This way,
 	there is only one system call made to do a write, unless we actually
 	have a need to wait.  This way, we get better performance.
-	The file descriptor is taken from the struct mansession pointer, if it is
-	non NULL, otherwise the parameter fd is used.
 */
-int ast_carefulwrite(int fd, char *s, int len, int timeoutms, void *vs);
+int ast_carefulwrite(int fd, char *s, int len, int timeoutms);
 
 /*! Compares the source address and port of two sockaddr_in */
 static force_inline int inaddrcmp(const struct sockaddr_in *sin1, const struct sockaddr_in *sin2)

Modified: team/group/ami_ssl/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/group/ami_ssl/res/res_agi.c?view=diff&rev=48104&r1=48103&r2=48104
==============================================================================
--- team/group/ami_ssl/res/res_agi.c (original)
+++ team/group/ami_ssl/res/res_agi.c Wed Nov 29 00:15:50 2006
@@ -129,7 +129,7 @@
 	} else {
 		if (agidebug)
 			ast_verbose("AGI Tx >> %s\n", stuff);
-		ast_carefulwrite(fd, stuff, strlen(stuff), 100, NULL);
+		ast_carefulwrite(fd, stuff, strlen(stuff), 100);
 		free(stuff);
 	}
 }