Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move two functions from rf_strutils.c into rf_configure.c, removing 

the need for rf_strutils.c.
This commit is contained in:
oster 1999-08-07 23:48:11 +00:00
parent 38de172f03
commit 180bbfd871
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/raidctl/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.5 1999/03/26 00:46:05 oster Exp $ # $NetBSD: Makefile,v 1.6 1999/08/07 23:48:11 oster Exp $
PROG= raidctl PROG= raidctl
SRCS= rf_configure.c rf_layout.c rf_strutils.c raidctl.c SRCS= rf_configure.c rf_layout.c raidctl.c
MAN= raidctl.8 MAN= raidctl.8
LOOKHERE = ${.CURDIR}/../../sys/dev/raidframe LOOKHERE = ${.CURDIR}/../../sys/dev/raidframe

22
sbin/raidctl/rf_configure.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_configure.c,v 1.6 1999/03/26 00:45:01 oster Exp $ */ /* $NetBSD: rf_configure.c,v 1.7 1999/08/07 23:48:11 oster Exp $ */
/* /*
* Copyright (c) 1995 Carnegie-Mellon University. * Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved. * All rights reserved.
@ -54,7 +54,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "rf_raid.h" #include "rf_raid.h"
#include "rf_raidframe.h" #include "rf_raidframe.h"
#include "rf_utils.h"
#include "rf_general.h" #include "rf_general.h"
#include "rf_decluster.h" #include "rf_decluster.h"
#include "rf_configure.h" #include "rf_configure.h"
@ -79,6 +78,9 @@ that file here in userland.. GO
bzero((char *)_p_, _size_); \ bzero((char *)_p_, _size_); \
} }
char *rf_find_non_white(char *p);
char *rf_find_white(char *p);
static int rf_search_file_for_start_of(char *string, char *buf, int len, static int rf_search_file_for_start_of(char *string, char *buf, int len,
@ -346,6 +348,22 @@ int rf_MakeLayoutSpecificDeclustered(configfp, cfgPtr, arg)
* *
***************************************************************************/ ***************************************************************************/
/* finds a non-white character in the line */
char *
rf_find_non_white(char *p)
{
for (; *p != '\0' && (*p == ' ' || *p == '\t'); p++);
return (p);
}
/* finds a white character in the line */
char *
rf_find_white(char *p)
{
for (; *p != '\0' && (*p != ' ' && *p != '\t'); p++);
return (p);
}
/* searches a file for a line that says "START string", where string is /* searches a file for a line that says "START string", where string is
* specified as a parameter * specified as a parameter
*/ */