Browse Source

consistently use #include "util.h" not <util.h> since util.h lives in this dir.

OPENBSD_3_0
millert 23 years ago
parent
commit
b2ff13368c
4 changed files with 13 additions and 10 deletions
  1. +3
    -3
      src/lib/libutil/check_expire.c
  2. +4
    -3
      src/lib/libutil/fparseln.c
  3. +3
    -2
      src/lib/libutil/opendisk.c
  4. +3
    -2
      src/lib/libutil/readlabel.c

+ 3
- 3
src/lib/libutil/check_expire.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: check_expire.c,v 1.1 2000/11/26 01:27:19 millert Exp $ */
/* $OpenBSD: check_expire.c,v 1.2 2001/08/16 18:34:40 millert Exp $ */
/* /*
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@ -46,11 +46,11 @@
#include <syslog.h> #include <syslog.h>
#include <time.h> #include <time.h>
#include <tzfile.h> #include <tzfile.h>
#include <util.h>
#include <login_cap.h> #include <login_cap.h>
#include <bsd_auth.h> #include <bsd_auth.h>
#include "util.h"
static char *pwd_update __P((struct passwd *)); static char *pwd_update __P((struct passwd *));
int int


+ 4
- 3
src/lib/libutil/fparseln.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: fparseln.c,v 1.1 1999/07/20 16:38:56 jakob Exp $
/* $OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $
/* $NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $ */ /* $NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $ */
/* /*
@ -31,7 +31,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static char rcsid[] = "$OpenBSD: fparseln.c,v 1.1 1999/07/20 16:38:56 jakob Exp $";
static char rcsid[] = "$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h> #include <sys/cdefs.h>
@ -39,7 +39,8 @@ static char rcsid[] = "$OpenBSD: fparseln.c,v 1.1 1999/07/20 16:38:56 jakob Exp
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <util.h>
#include "util.h"
static int isescaped __P((const char *, const char *, int)); static int isescaped __P((const char *, const char *, int));


+ 3
- 2
src/lib/libutil/opendisk.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: opendisk.c,v 1.1 1999/09/21 04:52:45 csapuntz Exp $ */
/* $OpenBSD: opendisk.c,v 1.2 2001/08/16 18:34:40 millert Exp $ */
/* $NetBSD: opendisk.c,v 1.4 1997/09/30 17:13:50 phil Exp $ */ /* $NetBSD: opendisk.c,v 1.4 1997/09/30 17:13:50 phil Exp $ */
/*- /*-
@ -42,11 +42,12 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <util.h>
#include <paths.h> #include <paths.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "util.h"
int int
opendisk(path, flags, buf, buflen, iscooked) opendisk(path, flags, buf, buflen, iscooked)
const char *path; const char *path;


+ 3
- 2
src/lib/libutil/readlabel.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: readlabel.c,v 1.4 1997/11/18 19:57:29 millert Exp $ */
/* $OpenBSD: readlabel.c,v 1.5 2001/08/16 18:34:40 millert Exp $ */
/* /*
* Copyright (c) 1996, Jason Downs. All rights reserved. * Copyright (c) 1996, Jason Downs. All rights reserved.
@ -33,7 +33,6 @@
#include <paths.h> #include <paths.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <util.h>
#include <sys/dkio.h> #include <sys/dkio.h>
#define DKTYPENAMES #define DKTYPENAMES
#include <sys/disklabel.h> #include <sys/disklabel.h>
@ -41,6 +40,8 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "util.h"
/* /*
* Try to get a disklabel for the specified device, and return mount_xxx * Try to get a disklabel for the specified device, and return mount_xxx
* style filesystem type name for the specified partition. * style filesystem type name for the specified partition.


Loading…
Cancel
Save