Fix a few stylistic warnings from Apple's C compilers.

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 942a07e..9c249f2 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -121,12 +121,13 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
      * Try to find host.
      */
     {
-       char buf[200];
-       sprintf(buf, "Looking up host \"%.170s\"", host);
+       char *buf;
+       buf = dupprintf("Looking up host \"%s\"", host);
        logevent(rlogin->frontend, buf);
+       sfree(buf);
     }
-    addr = sk_namelookup(host, realhost);
-    if ((err = sk_addr_error(addr)))
+    addr = name_lookup(host, port, realhost);
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     if (port < 0)
@@ -136,14 +137,15 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
      * Open socket.
      */
     {
-       char buf[200], addrbuf[100];
+       char *buf, addrbuf[100];
        sk_getaddr(addr, addrbuf, 100);
-       sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+       buf = dupprintf("Connecting to %s port %d", addrbuf, port);
        logevent(rlogin->frontend, buf);
+       sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
                               nodelay, (Plug) rlogin);
-    if ((err = sk_socket_error(rlogin->s)))
+    if ((err = sk_socket_error(rlogin->s)) != NULL)
        return err;
 
     sk_addr_free(addr);
@@ -162,7 +164,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        sk_write(rlogin->s, &z, 1);
        sk_write(rlogin->s, cfg.termtype, strlen(cfg.termtype));
        sk_write(rlogin->s, "/", 1);
-       for (p = cfg.termspeed; isdigit(*p); p++);
+       for (p = cfg.termspeed; isdigit(*p); p++) continue;
        sk_write(rlogin->s, cfg.termspeed, p - cfg.termspeed);
        rlogin->bufsize = sk_write(rlogin->s, &z, 1);
     }