From 1eddf6b197ba5fbd3f1cce390396efc7d25c9de9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 8 Dec 2005 13:30:43 +0100
Subject: Add some const

---
 bitlbee.c  |  2 +-
 bitlbee.h  |  2 +-
 crypting.c |  8 +++++---
 crypting.h |  6 +++---
 nick.c     | 21 ++++++++-------------
 nick.h     | 12 ++++++------
 6 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/bitlbee.c b/bitlbee.c
index 9f79d544..250d48ae 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -243,7 +243,7 @@ gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condi
 	}
 }
 
-int bitlbee_load( irc_t *irc, char* password )
+int bitlbee_load( irc_t *irc, const char* password )
 {
 	char s[512];
 	char *line;
diff --git a/bitlbee.h b/bitlbee.h
index 7ecc8d5d..805c7052 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -126,7 +126,7 @@ gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condi
 
 int root_command_string( irc_t *irc, user_t *u, char *command, int flags );
 int root_command( irc_t *irc, char *command[] );
-int bitlbee_load( irc_t *irc, char *password );
+int bitlbee_load( irc_t *irc, const char *password );
 int bitlbee_save( irc_t *irc );
 void bitlbee_shutdown( gpointer data );
 double gettime( void );
diff --git a/crypting.c b/crypting.c
index 4091ed08..e46f0b92 100644
--- a/crypting.c
+++ b/crypting.c
@@ -66,7 +66,8 @@ typedef struct irc
 
 /* USE WITH CAUTION!
    Sets pass without checking */
-void setpassnc (irc_t *irc, char *pass) {
+void setpassnc (irc_t *irc, const char *pass) 
+{
 	if (!set_find (irc, "password"))
 		set_add (irc, "password", NULL, passchange);
 	
@@ -80,12 +81,13 @@ void setpassnc (irc_t *irc, char *pass) {
 	}
 }
 
-char *passchange (irc_t *irc, void *set, char *value) {
+char *passchange (irc_t *irc, void *set, const char *value) {
 	setpassnc (irc, value);
 	return (NULL);
 }
 
-int setpass (irc_t *irc, char *pass, char* md5sum) {
+int setpass (irc_t *irc, const char *pass, const char* md5sum) 
+{
 	md5_state_t md5state;
 	md5_byte_t digest[16];
 	int i, j;
diff --git a/crypting.h b/crypting.h
index 0d4f0873..ab551ea3 100644
--- a/crypting.h
+++ b/crypting.h
@@ -23,9 +23,9 @@
   Suite 330, Boston, MA  02111-1307  USA
 */
 
-void setpassnc (irc_t *irc, char *pass); /* USE WITH CAUTION! */
-char *passchange (irc_t *irc, void *set, char *value);
-int setpass (irc_t *irc, char *pass, char* md5sum);
+void setpassnc (irc_t *irc, const char *pass); /* USE WITH CAUTION! */
+char *passchange (irc_t *irc, void *set, const char *value);
+int setpass (irc_t *irc, const char *pass, const char* md5sum);
 char *hashpass (irc_t *irc);
 char *obfucrypt (irc_t *irc, char *line);
 char *deobfucrypt (irc_t *irc, char *line);
diff --git a/nick.c b/nick.c
index ebf156c3..04dd374a 100644
--- a/nick.c
+++ b/nick.c
@@ -26,7 +26,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 
-void nick_set( irc_t *irc, char *handle, int proto, char *nick )
+void nick_set( irc_t *irc, const char *handle, int proto, const char *nick )
 {
 	nick_t *m = NULL, *n = irc->nicks;
 	
@@ -55,7 +55,7 @@ void nick_set( irc_t *irc, char *handle, int proto, char *nick )
 	nick_strip( n->nick );
 }
 
-char *nick_get( irc_t *irc, char *handle, int proto, const char *realname )
+char *nick_get( irc_t *irc, const char *handle, int proto, const char *realname )
 {
 	static char nick[MAX_NICK_LENGTH+1];
 	nick_t *n = irc->nicks;
@@ -128,7 +128,7 @@ char *nick_get( irc_t *irc, char *handle, int proto, const char *realname )
 	return( nick );
 }
 
-void nick_del( irc_t *irc, char *nick )
+void nick_del( irc_t *irc, const char *nick )
 {
 	nick_t *l = NULL, *n = irc->nicks;
 	
@@ -175,9 +175,9 @@ void nick_strip( char * nick )
 		nick[j++] = '\0';
 }
 
-int nick_ok( char *nick )
+int nick_ok( const char *nick )
 {
-	char *s;
+	const char *s;
 	
 	/* Empty/long nicks are not allowed */
 	if( !*nick || strlen( nick ) > MAX_NICK_LENGTH )
@@ -236,7 +236,7 @@ int nick_uc( char *nick )
 	return( 1 );
 }
 
-int nick_cmp( char *a, char *b )
+int nick_cmp( const char *a, const char *b )
 {
 	char aa[1024] = "", bb[1024] = "";
 	
@@ -252,12 +252,7 @@ int nick_cmp( char *a, char *b )
 	}
 }
 
-char *nick_dup( char *nick )
+char *nick_dup( const char *nick )
 {
-	char *cp;
-	
-	cp = g_new0 ( char, MAX_NICK_LENGTH + 1 );
-	strncpy( cp, nick, MAX_NICK_LENGTH );
-	
-	return( cp );
+	return g_strndup( nick, MAX_NICK_LENGTH );
 }
diff --git a/nick.h b/nick.h
index 5e53694c..2cd01ef5 100644
--- a/nick.h
+++ b/nick.h
@@ -31,13 +31,13 @@ typedef struct __NICK
 	struct __NICK *next;
 } nick_t;
 
-void nick_set( irc_t *irc, char *handle, int proto, char *nick );
-char *nick_get( irc_t *irc, char *handle, int proto, const char *realname );
-void nick_del( irc_t *irc, char *nick );
+void nick_set( irc_t *irc, const char *handle, int proto, const char *nick );
+char *nick_get( irc_t *irc, const char *handle, int proto, const char *realname );
+void nick_del( irc_t *irc, const char *nick );
 void nick_strip( char *nick );
 
-int nick_ok( char *nick );
+int nick_ok( const char *nick );
 int nick_lc( char *nick );
 int nick_uc( char *nick );
-int nick_cmp( char *a, char *b );
-char *nick_dup( char *nick );
+int nick_cmp( const char *a, const char *b );
+char *nick_dup( const char *nick );
-- 
cgit v1.2.3