Remove newlines from log messages.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index ad7c57d..0d58d6a 100644 (file)
--- 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.
 
     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.146 2003/08/03 12:38:43 guus Exp $

 */
 
 #include "system.h"
 */
 
 #include "system.h"


@@ -53,12 +53,10 @@ static char (*request_name[]) = {
 
 static avl_tree_t *past_request_tree;
 
 
 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;
                        return false;
 
        return true;


@@ -180,7 +178,7 @@ bool receive_request(connection_t *c)
        return true;
 }
 
        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);
 }
 {
        return strcmp(a->request, b->request);
 }


@@ -211,7 +209,7 @@ void exit_requests(void)
 
 bool seen_request(char *request)
 {
 
 bool seen_request(char *request)
 {

-       past_request_t p, *new;
+       past_request_t *new, p = {0};

 
        cp();
 
 
        cp();
 


@@ -248,6 +246,6 @@ void age_past_requests(void)
        }
 
        if(left || deleted)
        }
 
        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);
 }
                           deleted, left);
 }