[Iaxclient-cvs] SF.net SVN: iaxclient: [1048] trunk/lib

[<jpg...@us...>]

Revision: 1048
          http://svn.sourceforge.net/iaxclient/?rev=1048&view=rev
Author:   jpgrayson
Date:     2007-07-02 12:48:05 -0700 (Mon, 02 Jul 2007)

Log Message:
-----------
Constify some character pointers. Makes pedantic compilers more happiful.

Modified Paths:
--------------
    trunk/lib/iaxclient.h
    trunk/lib/iaxclient_lib.c
    trunk/lib/libiax2/src/iax-client.h
    trunk/lib/libiax2/src/iax.c

Modified: trunk/lib/iaxclient.h
===================================================================
--- trunk/lib/iaxclient.h	2007-07-02 15:01:17 UTC (rev 1047)
+++ trunk/lib/iaxclient.h	2007-07-02 19:48:05 UTC (rev 1048)
@@ -283,22 +283,22 @@
 EXPORT void iaxc_shutdown();
 EXPORT void iaxc_set_formats(int preferred, int allowed);
 EXPORT void iaxc_set_min_outgoing_framesize(int samples);
-EXPORT void iaxc_set_callerid(char *name, char *number);
+EXPORT void iaxc_set_callerid(const char * name, const char * number);
 EXPORT int iaxc_start_processing_thread();
 EXPORT int iaxc_stop_processing_thread();
-EXPORT int iaxc_call(char *num);
+EXPORT int iaxc_call(const char * num);
 EXPORT int iaxc_unregister( int id );
-EXPORT int iaxc_register(char *user, char *pass, char *host);
-EXPORT void iaxc_send_busy_on_incoming_call(int callNo);    //frik
+EXPORT int iaxc_register(const char * user, const char * pass, const char * host);
+EXPORT void iaxc_send_busy_on_incoming_call(int callNo);
 EXPORT void iaxc_answer_call(int callNo);
-EXPORT void iaxc_blind_transfer_call(int callNo, char *number);
+EXPORT void iaxc_blind_transfer_call(int callNo, const char * number);
 EXPORT void iaxc_dump_all_calls(void);
 EXPORT void iaxc_dump_call(void);
 EXPORT void iaxc_reject_call(void);
 EXPORT void iaxc_reject_call_number(int callNo);
 EXPORT void iaxc_send_dtmf(char digit);
-EXPORT void iaxc_send_text(char *text);
-EXPORT void iaxc_send_url(char *url, int link); /* link == 1 ? AST_HTML_LINKURL : AST_HTML_URL */
+EXPORT void iaxc_send_text(const char * text);
+EXPORT void iaxc_send_url(const char *url, int link); /* link == 1 ? AST_HTML_LINKURL : AST_HTML_URL */
 EXPORT void iaxc_millisleep(long ms);
 EXPORT void iaxc_set_silence_threshold(float thr);
 EXPORT void iaxc_set_audio_output(int mode);
@@ -329,7 +329,7 @@
 #define IAXC_AD_RING_DEFAULT    (1<<5)
 
 struct iaxc_audio_device {
-	char *name;             /* name of the device */
+	const char * name;      /* name of the device */
 	long capabilities;      /* flags, defined above */
 	int devID;              /* driver-specific ID */
 };

Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c	2007-07-02 15:01:17 UTC (rev 1047)
+++ trunk/lib/iaxclient_lib.c	2007-07-02 19:48:05 UTC (rev 1048)
@@ -204,7 +204,7 @@
 }
 
 // Messaging functions
-static void default_message_callback(char *message)
+static void default_message_callback(const char * message)
 {
 	fprintf(stderr, "IAXCLIENT: %s\n", message);
 }
@@ -682,7 +682,7 @@
 	minimum_outgoing_framesize = samples;
 }
 
-EXPORT void iaxc_set_callerid(char *name, char *number)
+EXPORT void iaxc_set_callerid(const char * name, const char * number)
 {
 	int i;
 
@@ -1259,7 +1259,7 @@
 	return count;
 }
 
-EXPORT int iaxc_register(char *user, char *pass, char *host)
+EXPORT int iaxc_register(const char * user, const char * pass, const char * host)
 {
 	struct iaxc_registration *newreg;
 
@@ -1322,7 +1322,7 @@
 	}
 }
 
-EXPORT int iaxc_call(char *num)
+EXPORT int iaxc_call(const char * num)
 {
 	int video_format_capability;
 	int video_format_preferred;
@@ -1420,9 +1420,9 @@
 	iaxci_do_state_callback(callNo);
 }
 
-EXPORT void iaxc_blind_transfer_call(int callNo, char *DestExtn)
+EXPORT void iaxc_blind_transfer_call(int callNo, const char * dest_extension)
 {
-	iax_transfer(calls[callNo].session, DestExtn);
+	iax_transfer(calls[callNo].session, dest_extension);
 }
 
 static void iaxc_dump_one_call(int callNo)
@@ -1487,7 +1487,7 @@
 	}
 }
 
-EXPORT void iaxc_send_text(char *text)
+EXPORT void iaxc_send_text(const char * text)
 {
 	if (selected_call >= 0)
 	{
@@ -1498,7 +1498,7 @@
 	}
 }
 
-EXPORT void iaxc_send_url(char *url, int link)
+EXPORT void iaxc_send_url(const char * url, int link)
 {
 	if (selected_call >= 0)
 	{
@@ -1848,7 +1848,7 @@
 
 #ifdef LIBVER
 
-EXPORT char* iaxc_version(char* ver)
+EXPORT char* iaxc_version(char * ver)
 {
 	strncpy(ver, LIBVER, IAXC_EVENT_BUFSIZ);
 	return ver;

Modified: trunk/lib/libiax2/src/iax-client.h
===================================================================
--- trunk/lib/libiax2/src/iax-client.h	2007-07-02 15:01:17 UTC (rev 1047)
+++ trunk/lib/libiax2/src/iax-client.h	2007-07-02 19:48:05 UTC (rev 1048)
@@ -167,15 +167,15 @@
 extern int iax_send_voice(struct iax_session *session, int format, unsigned char *data, int datalen, int samples);
 extern int iax_send_cng(struct iax_session *session, int level, unsigned char *data, int datalen);
 extern int iax_send_image(struct iax_session *session, int format, unsigned char *data, int datalen);
-extern int iax_send_url(struct iax_session *session, char *url, int link);
-extern int iax_send_text(struct iax_session *session, char *text);
+extern int iax_send_url(struct iax_session *session, const char *url, int link);
+extern int iax_send_text(struct iax_session *session, const char *text);
 extern int iax_send_ping(struct iax_session *session);
 extern int iax_load_complete(struct iax_session *session);
 extern int iax_reject(struct iax_session *session, char *reason);
 extern int iax_busy(struct iax_session *session);
 extern int iax_congestion(struct iax_session *session);
 extern int iax_hangup(struct iax_session *session, char *byemsg);
-extern int iax_call(struct iax_session *session, char *cidnum, char *cidname, char *ich, char *lang, int wait, int format, int capability);
+extern int iax_call(struct iax_session *session, const char *cidnum, const char *cidname, const char *ich, const char *lang, int wait, int format, int capability);
 extern int iax_accept(struct iax_session *session, int format);
 extern int iax_answer(struct iax_session *session);
 extern int iax_sendurl(struct iax_session *session, char *url);
@@ -183,13 +183,13 @@
 extern int iax_send_link_reject(struct iax_session *session);
 extern int iax_ring_announce(struct iax_session *session);
 extern struct sockaddr_in iax_get_peer_addr(struct iax_session *session);
-extern int iax_register(struct iax_session *session, char *hostname, char *peer, char *secret, int refresh);
+extern int iax_register(struct iax_session *session, const char *hostname, const char *peer, const char *secret, int refresh);
 extern int iax_lag_request(struct iax_session *session);
 extern int iax_dial(struct iax_session *session, char *number); /* Dial on a TBD call */
 extern int iax_dialplan_request(struct iax_session *session, char *number); /* Request dialplan status for number */
 extern int iax_quelch(struct iax_session *session);
 extern int iax_unquelch(struct iax_session * session);
-extern int iax_transfer(struct iax_session *session, char *number);
+extern int iax_transfer(struct iax_session *session, const char *number);
 extern int iax_quelch_moh(struct iax_session *session, int MOH);
 extern int iax_send_video(struct iax_session *session, int format, unsigned char *data, int datalen, int fullframe);
 extern int iax_send_video_trunk(struct iax_session *session, int format, char *data, int datalen, int fullframe, int ntrunk);

Modified: trunk/lib/libiax2/src/iax.c
===================================================================
--- trunk/lib/libiax2/src/iax.c	2007-07-02 15:01:17 UTC (rev 1047)
+++ trunk/lib/libiax2/src/iax.c	2007-07-02 19:48:05 UTC (rev 1048)
@@ -1292,7 +1292,7 @@
 }
 
 
-int iax_transfer(struct iax_session *session, char *number)
+int iax_transfer(struct iax_session *session, const char *number)
 {
 	static int res;				//Return Code
 	struct iax_ie_data ied;			//IE Data Structure (Stuff To Send)
@@ -1677,7 +1677,7 @@
 	return 0;
 }
 
-int iax_register(struct iax_session *session, char *server, char *peer, char *secret, int refresh)
+int iax_register(struct iax_session *session, const char *server, const char *peer, const char *secret, int refresh)
 {
 	/* Send a registration request */
 	char tmp[256];
@@ -1780,14 +1780,14 @@
 	return send_command(session, AST_FRAME_HTML, AST_HTML_LDCOMPLETE, 0, NULL, 0, -1);
 }
 
-int iax_send_url(struct iax_session *session, char *url, int link)
+int iax_send_url(struct iax_session *session, const char *url, int link)
 {
 	return send_command(session, AST_FRAME_HTML,
 			link ? AST_HTML_LINKURL : AST_HTML_URL, 0,
 			(unsigned char *)url, (int)strlen(url), -1);
 }
 
-int iax_send_text(struct iax_session *session, char *text)
+int iax_send_text(struct iax_session *session, const char *text)
 {
 	return send_command(session, AST_FRAME_TEXT, 0, 0,
 			(unsigned char *)text, (int)strlen(text) + 1, -1);
@@ -2009,7 +2009,7 @@
 	return x;
 }
 
-int iax_call(struct iax_session *session, char *cidnum, char *cidname, char *ich, char *lang, int wait, int formats, int capabilities)
+int iax_call(struct iax_session *session, const char *cidnum, const char *cidname, const char *ich, const char *lang, int wait, int formats, int capabilities)
 {
 	char tmp[256]="";
 	char *part1, *part2;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.