From f4dff807f0c4317fc06052733a31a34ca2435e25 Mon Sep 17 00:00:00 2001 From: millert <> Date: Sun, 29 Jul 2001 21:15:23 +0000 Subject: [PATCH] Minor style pedentry from ben@arbor.net plus some of my own and sync libkern and libc versions. --- src/lib/libc/string/strlen.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/lib/libc/string/strlen.c b/src/lib/libc/string/strlen.c index 332d5766..ab006e04 100644 --- a/src/lib/libc/string/strlen.c +++ b/src/lib/libc/string/strlen.c @@ -1,6 +1,8 @@ +/* $OpenBSD: strlen.c,v 1.4 2001/07/29 21:15:23 millert Exp $ */ + /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,10 +34,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlen.c,v 1.3 1996/08/19 08:34:19 tholo Exp $"; +static char *rcsid = "$OpenBSD: strlen.c,v 1.4 2001/07/29 21:15:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_STANDALONE) #include #else #include @@ -45,9 +47,10 @@ size_t strlen(str) const char *str; { - register const char *s; + const char *s; - for (s = str; *s; ++s); - return(s - str); + for (s = str; *s; ++s) + ; + return (s - str); }