3 files changed, 5 insertions, 6 deletions
diff --git a/fd.c b/fd.c
index 645acb5..0945d41 100644
--- a/fd.c
+++ b/fd.c
@@ -218,8 +218,8 @@ AcceptConnection (
     FD  ConnectionSocket)
 {
   FD ClientFD;
-  struct sockaddr_in  from;
-  int    len = sizeof (from);
+  struct sockaddr_in from;
+  socklen_t len = sizeof (from);
   int	 tmp = 1;
 
   enterprocedure("ConnectToClient");
diff --git a/scope.c b/scope.c
index 1118200..94ba173 100644
--- a/scope.c
+++ b/scope.c
@@ -466,8 +466,7 @@ CMDBreak (
   {
     for (prev = &breakPoints; *prev; prev = &(*prev)->next);
     while (*++argv) {
-      if (minorname = strchr(*argv, ':')) {
-	int r;
+      if ((minorname = strchr(*argv, ':'))) {
 	*minorname = '\0';
 	if (!CMDStringToInt (minorname + 1, &minorop) ||
 	    (minorop < 0) || (minorop > 255)) {
@@ -564,7 +563,7 @@ CMDDelete (
     while (*++argv) {
       if (!CMDStringToInt (*argv, &number))
 	return CMDSyntax;
-      for (prev = &breakPoints; bp = *prev; prev = &bp->next)
+      for (prev = &breakPoints; (bp = *prev) != NULL; prev = &bp->next)
       {
 	if (bp->number == number)
 	{
diff --git a/table11.c b/table11.c
index 55c6982..27df01c 100644
--- a/table11.c
+++ b/table11.c
@@ -165,7 +165,7 @@ DeleteValueRec (
 {
     ValuePtr	*bucket, value;
 
-    for (bucket = &buckets[HASH(key)]; value = *bucket; bucket = &value->next)
+    for (bucket = &buckets[HASH(key)]; (value = *bucket) != NULL; bucket = &value->next)
     {
 	if (value->key == key)
 	{