Changeset devel,70

Timestamp:

2005-12-08T12:30:43Z (4 years ago)

Author:

Jelmer Vernooij <jelmer@…>

branch-nick:

jelmer.integration

revision id:

jelmer@samba.org-20051208123043-ce4dfb0d4eb5beb6

Message:

Add some const

Location:

devel

Files:

• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• crypting.c (modified) (2 diffs)
• crypting.h (modified) (1 diff)
• nick.c (modified) (6 diffs)
• nick.h (modified) (1 diff)

devel/bitlbee.c

@@ -244 +244 @@
 }
 
-int bitlbee_load( irc_t *irc, char* password )
+int bitlbee_load( irc_t *irc, const char* password )
 {
         char s[512];

devel/bitlbee.h

@@ -127 +127 @@
 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 );

devel/crypting.c

@@ -67 +67 @@
 /* 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);
@@ -81 +82 @@
 }
 
-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];

devel/crypting.h

@@ -24 +24 @@
 */
 
-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);

devel/nick.c

@@ -27 +27 @@
 #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;
@@ -56 +56 @@
 }
 
-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];
@@ -129 +129 @@
 }
 
-void nick_del( irc_t *irc, char *nick )
+void nick_del( irc_t *irc, const char *nick )
 {
         nick_t *l = NULL, *n = irc->nicks;
@@ -176 +176 @@
 }
 
-int nick_ok( char *nick )
-{
-        char *s;
+int nick_ok( const char *nick )
+{
+        const char *s;
         
         /* Empty/long nicks are not allowed */
@@ -237 +237 @@
 }
 
-int nick_cmp( char *a, char *b )
+int nick_cmp( const char *a, const char *b )
 {
         char aa[1024] = "", bb[1024] = "";
@@ -253 +253 @@
 }
 
-char *nick_dup( char *nick )
-{
-        char *cp;
-        
-        cp = g_new0 ( char, MAX_NICK_LENGTH + 1 );
-        strncpy( cp, nick, MAX_NICK_LENGTH );
-        
-        return( cp );
-}
+char *nick_dup( const char *nick )
+{
+        return g_strndup( nick, MAX_NICK_LENGTH );
+}

devel/nick.h

@@ -32 +32 @@
 } 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 );