Quellcode durchsuchen

* Fix const char* issues

Bryan Drewery vor 17 Jahren
Ursprung
Commit
1fb2fa96c9
4 geänderte Dateien mit 11 neuen und 10 gelöschten Zeilen
  1. 6 5
      src/net.c
  2. 3 3
      src/net.h
  3. 1 1
      src/userrec.c
  4. 1 1
      src/userrec.h

+ 6 - 5
src/net.c

@@ -393,10 +393,10 @@ void setsock(int sock, int options)
 }
 
 #ifdef USE_IPV6
-int real_getsock(int options, int af_def, char *fname, int line)
+int real_getsock(int options, int af_def, const char *fname, int line)
 {
 #else
-int real_getsock(int options, char *fname, int line)
+int real_getsock(int options, const char *fname, int line)
 {
   int af_def = AF_INET;
 #endif /* USE_IPV6 */
@@ -1228,7 +1228,7 @@ int sockgets(char *s, int *len)
  * 
  * NOTE: Do NOT put Contexts in here if you want DEBUG to be meaningful!!
  */
-void tputs(register int z, char *s, size_t len)
+void tputs(register int z, const char *s, size_t len)
 {
   if (z < 0)			/* um... HELLO?!  sanity check please! */
     return;			
@@ -1312,8 +1312,9 @@ void tputs(register int z, char *s, size_t len)
 
     putlog(LOG_MISC, "*", "!!! writing to nonexistent socket: %d", z);
     if (strlen(s)) {
-      s[strlen(s) - 1] = 0;
-      putlog(LOG_MISC, "*", "!-> '%s'", s);
+      char *tmp = strdup(s); /* To null-terminate */
+      putlog(LOG_MISC, "*", "!-> '%s'", tmp);
+      free(tmp);
     }
 
     inhere = 0;

+ 3 - 3
src/net.h

@@ -104,10 +104,10 @@ int allocsock(int, int);
 
 #ifdef USE_IPV6
 #define getsock(opt, af) real_getsock(opt, af, __FILE__, __LINE__)
-int real_getsock(int, int, char *, int);
+int real_getsock(int, int, const char *, int);
 #else
 #define getsock(opt) real_getsock(opt, __FILE__, __LINE__)
-int real_getsock(int, char *, int);
+int real_getsock(int, const char *, int);
 #endif /* USE_IPV6 */
 
 
@@ -125,7 +125,7 @@ int open_address_listen(in_addr_t, port_t *);
 int open_telnet(const char *, port_t, bool proxy = 0, int identd = 0);
 int open_telnet_dcc(int, char *, char *);
 int open_telnet_raw(int, const char *, port_t, bool, int = 0);
-void tputs(int, char *, size_t);
+void tputs(int, const char *, size_t);
 void dequeue_sockets();
 int sockgets(char *, int *);
 void tell_netdebug(int);

+ 1 - 1
src/userrec.c

@@ -323,7 +323,7 @@ void convert_password(struct userrec *u)
 /* Try: pass_match_by_host("-",host)
  * will return 1 if no password is set for that host
  */
-int u_pass_match(struct userrec *u, char *in)
+int u_pass_match(struct userrec *u, const char *in)
 {
   if (!u)
     return 0;

+ 1 - 1
src/userrec.h

@@ -9,7 +9,7 @@ struct userrec *adduser(struct userrec *, char *, char *, char *, flag_t, int);
 void addhost_by_handle(char *, char *);
 void clear_masks(struct maskrec *);
 void clear_userlist(struct userrec *);
-int u_pass_match(struct userrec *, char *);
+int u_pass_match(struct userrec *, const char *);
 int delhost_by_handle(char *, char *);
 int count_users(struct userrec *);
 int deluser(char *);