diff --git a/src/ChangeLog b/src/ChangeLog
index 07b53de5..9d6ce3d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2005-05-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* netrc.c (parse_netrc): Explicitly check for assignment != NULL
+	to silence warning from Borland C.
+
+	* url.c (sync_path): Don't unnecessarily increment p.
+	(url_parse): Don't unnecessarily set url_encode to NULL just
+	prior to return from the function.
+
+2005-05-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* log.c (escnonprint_internal): Place variable declarations
+	before other statements.
+
 2005-05-08  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* html-url.c: Include recur.h.
diff --git a/src/netrc.c b/src/netrc.c
index bb4dc8c5..23a23ca4 100644
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -284,7 +284,7 @@ parse_netrc (const char *path)
   premature_token = NULL;
 
   /* While there are lines in the file...  */
-  while ((line = read_whole_line (fp)))
+  while ((line = read_whole_line (fp)) != NULL)
     {
       ln ++;
 
diff --git a/src/url.c b/src/url.c
index 31148735..aa3b5978 100644
--- a/src/url.c
+++ b/src/url.c
@@ -874,7 +874,6 @@ url_parse (const char *url, int *error)
       else
 	u->url = url_encoded;
     }
-  url_encoded = NULL;
 
   return u;
 
@@ -1067,7 +1066,7 @@ sync_path (struct url *u)
       *p++ = '/';
       memcpy (p, efile, filelen);
       p += filelen;
-      *p++ = '\0';
+      *p = '\0';
     }
 
   u->path = newpath;