2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 512fbc7e9..aefc0b8c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20100626
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2010/05/21 05:00:36
+     [misc.c]
+     colon() returns char*, so s/return (0)/return NULL/
+
 20100622
  - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
    bz#1579; ok dtucker
diff --git a/misc.c b/misc.c
index e1f723123..b19ece836 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.75 2010/01/09 23:04:13 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.76 2010/05/21 05:00:36 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -425,7 +425,7 @@ colon(char *cp)
         int flag = 0;
 
         if (*cp == ':')         /* Leading colon is part of file name. */
-                return (0);
+                return NULL;
         if (*cp == '[')
                 flag = 1;
 
@@ -437,9 +437,9 @@ colon(char *cp)
                 if (*cp == ':' && !flag)
                         return (cp);
                 if (*cp == '/')
-                        return (0);
+                        return NULL;
         }
-        return (0);
+        return NULL;
 }
 
 /* function to assist building execv() arguments */