tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Sync 

- djm@cvs.openbsd.org 2010/05/21 05:00:36
     [misc.c]
     colon() returns char*, so s/return (0)/return NULL/
This commit is contained in:
Damien Miller 2010-06-26 09:30:47 +10:00
parent d82a260fdf
commit 2e77446a13
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 20100622
- (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
bz#1579; ok dtucker bz#1579; ok dtucker

8
misc.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -425,7 +425,7 @@ colon(char *cp)
int flag = 0; int flag = 0;
if (*cp == ':') /* Leading colon is part of file name. */ if (*cp == ':') /* Leading colon is part of file name. */
return (0); return NULL;
if (*cp == '[') if (*cp == '[')
flag = 1; flag = 1;
@ -437,9 +437,9 @@ colon(char *cp)
if (*cp == ':' && !flag) if (*cp == ':' && !flag)
return (cp); return (cp);
if (*cp == '/') if (*cp == '/')
return (0); return NULL;
} }
return (0); return NULL;
} }
/* function to assist building execv() arguments */ /* function to assist building execv() arguments */