diff --git a/src/ascii-xfr.c b/src/ascii-xfr.c
index 79af763..ca27ebf 100644
--- a/src/ascii-xfr.c
+++ b/src/ascii-xfr.c
@@ -207,7 +207,7 @@ int arecv(char *file)
   }
 
   while ((n = read(STDIN_FILENO, line, sizeof(line))) > 0) {
-    for (s = line; s - line < n; s++) {
+    for (s = line; n-- >0; s++) {
       if (*s == eofchar)
         break;
       if (dotrans && *s == '\r')
@@ -217,7 +217,7 @@ int arecv(char *file)
     }
     stats(first);
     first = 0;
-    if (s - line < n && *s == eofchar)
+    if (*s == eofchar)
       break;
   }
   fclose(fp);
diff --git a/src/common.c b/src/common.c
index 48f68f9..86d806c 100644
--- a/src/common.c
+++ b/src/common.c
@@ -74,7 +74,6 @@ void do_log(const char *line, ...)
 	  (ptr->tm_year)+1900, (ptr->tm_mon)+1, ptr->tm_mday,
 	  ptr->tm_hour, ptr->tm_min, ptr->tm_sec);
   vfprintf(logfile, line, ap);
-  va_end(ap);
   fprintf(logfile, "\n");
   fclose(logfile);
 #else
diff --git a/src/config.c b/src/config.c
index 0da4989..78b25aa 100644
--- a/src/config.c
+++ b/src/config.c
@@ -88,7 +88,6 @@ void read_parms(void)
   for (f = PROTO_BASE; f < MAXPROTO; f++) {
     if (P_PNAME(f)[0] && P_PIORED(f) != 'Y' && P_PIORED(f) != 'N') {
       strncpy(buf, P_PNAME(f) - 2, sizeof(buf));
-      buf[sizeof(buf) - 1] = '\0';
       strcpy(P_PNAME(f), buf);
       P_PIORED(f) = 'Y';
       P_PFULL(f) = 'N';
@@ -536,9 +535,7 @@ static void doserial(void)
 {
   WIN *w;
   char *serial_device         = _(" A -    Serial Device      :");
-#if !HAVE_LOCKDEV
   char *lockfile_location     = _(" B - Lockfile Location     :");
-#endif
   char *callin_program        = _(" C -   Callin Program      :");
   char *callout_program       = _(" D -  Callout Program      :");
   char *bps_par_bits          = _(" E -    Bps/Par/Bits       :");
@@ -1865,7 +1862,6 @@ void doconv(void)
 int loadconv(char *buf)
 {
   FILE *fp;
-  int err = 0;
 
   if ((fp = fopen(pfix_home(buf), "rb")) == (FILE *)NULL) {
     werror(_("Cannot open conversion table %s"), pfix_home(buf));
@@ -1875,11 +1871,10 @@ int loadconv(char *buf)
       || fread(vt_outmap, sizeof(vt_outmap), (size_t)1, fp) != 1)
     {
       werror(_("Cannot read conversion table %s"), pfix_home(buf));
-      err = 1;
+      return 1;
     }
-
   fclose(fp);
-  return err;
+  return 0;
 }
 
 int saveconv(char *buf)
diff --git a/src/dial.c b/src/dial.c
index eada5ee..a90c1d2 100644
--- a/src/dial.c
+++ b/src/dial.c
@@ -829,11 +829,8 @@ static int v1_read(FILE *fp, struct dialent *d)
 
   memcpy(d->username, v1.username, sizeof(v1) - offsetof(struct v1_dialent, username));
   strncpy(d->name, v1.name, sizeof(d->name));
-  d->name[sizeof(d->name) - 1] = '\0';
   strncpy(d->number, v1.number, sizeof(d->number));
-  d->number[sizeof(d->number) - 1] = '\0';
   strncpy(d->script, v1.script, sizeof(d->script));
-  d->script[sizeof(d->script) - 1] = '\0';
   d->lastdate[0]=0;
   d->lasttime[0]=0;
   d->count=0;
@@ -912,7 +909,6 @@ int readdialdir(void)
   if (fread(&dial_ver, sizeof(dial_ver), 1, fp) != 1)
     {
       werror(_("Failed to read dialing directory\n"));
-      fclose(fp);
       return -1;
     }
   if (dial_ver.magic != DIALMAGIC) {
@@ -948,14 +944,12 @@ int readdialdir(void)
           dial_ver.size > sizeof(struct v4_dialent)) {
         werror(_("Phonelist garbled (unknown version?)"));
         dialents = mkstdent();
-        fclose(fp);
         return -1;
       }
       break;
     case 5:
       if (dial_ver.size != sizeof(struct dialent)) {
 	werror(_("Phonelist corrupted"));
-        fclose(fp);
 	return -1;
       }
       break;
@@ -964,7 +958,6 @@ int readdialdir(void)
       // have different size on 32 and 64bit systems
       if (dial_ver.size != sizeof(struct dialent) - sizeof(void *)) {
         werror(_("Phonelist corrupted"));
-        fclose(fp);
         return -1;
       }
       break;
@@ -972,7 +965,6 @@ int readdialdir(void)
       werror(_("Unknown dialing directory version"));
       dendd = 1;
       dialents = mkstdent();
-      fclose(fp);
       return -1;
   }
 
diff --git a/src/getsdir.c b/src/getsdir.c
index bd6b763..2195b27 100644
--- a/src/getsdir.c
+++ b/src/getsdir.c
@@ -228,7 +228,6 @@ int getsdir(const char *dirpath, const char *pattern, int sortflags,
           if (!*datptr)
             {
               free(*datptr);
-              closedir(dirp);
               return -1;
             }
 
diff --git a/src/minicom.c b/src/minicom.c
index 876805a..4eb47d4 100644
--- a/src/minicom.c
+++ b/src/minicom.c
@@ -1208,7 +1208,6 @@ int main(int argc, char **argv)
           break;
         case 't': /* Terminal type */
           strncpy(termtype, optarg, sizeof(termtype));
-          termtype[sizeof(termtype) - 1] = '\0';
 #ifdef __GLIBC__
           /* Bug in older libc's (< 4.5.26 I think) */
           if ((s = getenv("TERMCAP")) != NULL && *s != '/')
@@ -1323,9 +1322,7 @@ int main(int argc, char **argv)
     strncpy(homedir, pwd->pw_dir, sizeof(homedir));
   else
     strncpy(homedir, s, sizeof(homedir));
-  homedir[sizeof(homedir) - 1] = '\0';
   strncpy(username, pwd->pw_name, sizeof(username));
-  username[sizeof(username) - 1] = '\0';
 
   /* Get personal parameter file */
   snprintf(pparfile, sizeof(pparfile), "%s/.minirc.%s", homedir, use_port);
diff --git a/src/script.c b/src/script.c
index f7c4e3f..ee1284f 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1099,14 +1099,12 @@ int main(int argc, char **argv)
 
   if (argc > 2) {
     strncpy(logfname, argv[2], sizeof(logfname));
-    logfname[sizeof(logfname) - 1] = '\0';
     if (argc > 3)
       strncpy(homedir, argv[3], sizeof(homedir));
     else if ((s = getenv("HOME")) != NULL)
       strncpy(homedir, s, sizeof(homedir));
     else
       homedir[0] = 0;
-    homedir[sizeof(homedir) - 1] = '\0';
   }
   else
     logfname[0] = 0;
diff --git a/src/updown.c b/src/updown.c
index 54442bb..726328e 100644
--- a/src/updown.c
+++ b/src/updown.c
@@ -386,7 +386,6 @@ void updown(int what, int nr)
             do_log("%s", trimbuf);
           } else if (!strncmp (buffirst, "Bytes", 5)) {
             strncpy (xfrstr, buf, sizeof(xfrstr));
-            xfrstr[sizeof(xfrstr) - 1] = '\0';
           }
           buffirst[0] = 0;
           trimbuf[0] = 0;
@@ -699,11 +698,8 @@ void runscript(int ask, const char *s, const char *l, const char *p)
     }
   } else {
     strncpy(scr_user, l, sizeof(scr_user));
-    scr_user[sizeof(scr_user) - 1] = '\0';
     strncpy(scr_name, s, sizeof(scr_name));
-    scr_name[sizeof(scr_name) - 1] = '\0';
     strncpy(scr_passwd, p, sizeof(scr_passwd));
-    scr_passwd[sizeof(scr_passwd) - 1] = '\0';
   }
   sprintf(scr_lines, "%d", (int) lines);  /* jl 13.09.97 */