X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=4e37bf5523b76f721b40974230777ca0a3022467;hp=ad7c57d78dd1ac3197df0b900fb793c8cb338f72;hb=6c5f3d8b74ffea1522a727ef189a5ba65a939e07;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/protocol.c b/src/protocol.c
index ad7c57d7..4e37bf55 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.142 2003/07/22 20:55:20 guus Exp $
+    $Id: protocol.c,v 1.28.4.147 2003/08/28 21:05:10 guus Exp $
 */
 
 #include "system.h"
@@ -53,12 +53,10 @@ static char (*request_name[]) = {
 
 static avl_tree_t *past_request_tree;
 
-bool check_id(char *id)
+bool check_id(const char *id)
 {
-	int i;
-
-	for(i = 0; i < strlen(id); i++)
-		if(!isalnum(id[i]) && id[i] != '_')
+	for(; *id; id++)
+		if(!isalnum(*id) && *id != '_')
 			return false;
 
 	return true;
@@ -180,7 +178,7 @@ bool receive_request(connection_t *c)
 	return true;
 }
 
-static int past_request_compare(past_request_t *a, past_request_t *b)
+static int past_request_compare(const past_request_t *a, const past_request_t *b)
 {
 	return strcmp(a->request, b->request);
 }
@@ -211,7 +209,7 @@ void exit_requests(void)
 
 bool seen_request(char *request)
 {
-	past_request_t p, *new;
+	past_request_t *new, p = {0};
 
 	cp();
 
@@ -221,7 +219,7 @@ bool seen_request(char *request)
 		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
 		return true;
 	} else {
-		new = (past_request_t *) xmalloc(sizeof(*new));
+		new = xmalloc(sizeof(*new));
 		new->request = xstrdup(request);
 		new->firstseen = now;
 		avl_insert(past_request_tree, new);
@@ -239,7 +237,7 @@ void age_past_requests(void)
 
 	for(node = past_request_tree->head; node; node = next) {
 		next = node->next;
-		p = (past_request_t *) node->data;
+		p = node->data;
 
 		if(p->firstseen + pingtimeout < now)
 			avl_delete_node(past_request_tree, node), deleted++;
@@ -248,6 +246,6 @@ void age_past_requests(void)
 	}
 
 	if(left || deleted)
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"),
+		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"),
 			   deleted, left);
 }