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

Header cleanup: don't need defs.h to do a few includes for us. Also,

Browse Source 
use #include <> for global headers instead of #include "".
This commit is contained in:
pooka 2007-11-05 13:41:52 +00:00
parent 0b718fbde6
commit 02a45a4a7c
4 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/librefuse/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2007/10/21 16:46:52 pooka Exp $
# $NetBSD: Makefile,v 1.8 2007/11/05 13:41:52 pooka Exp $
USE_FORT?= yes # data driven bugs?
@ -12,7 +12,6 @@ FUSE_OPT_DEBUG_FLAGS= -g -DFUSE_OPT_DEBUG
CFLAGS+= ${FUSE_OPT_DEBUG_FLAGS}
SRCS= refuse.c refuse_opt.c
CPPFLAGS+= -I.
MAN= refuse.3
WARNS= 4
INCS= fuse.h fuse_opt.h

44
lib/librefuse/defs.h
View File

@ -1,44 +0,0 @@
/* $NetBSD: defs.h,v 1.2 2007/05/16 21:39:08 christos Exp $ */
/*
* Copyright (c) 1999-2005 Alistair Crooks. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote
* products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef DEFS_H_
#define DEFS_H_
#include <sys/types.h>
#include <sys/param.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#endif /* !DEFS_H_ */

11
lib/librefuse/refuse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: refuse.c,v 1.80 2007/11/05 13:38:27 pooka Exp $ */
/* $NetBSD: refuse.c,v 1.81 2007/11/05 13:41:52 pooka Exp $ */
/*
* Copyright © 2007 Alistair Crooks. All rights reserved.
@ -30,21 +30,24 @@
#include <sys/cdefs.h>
#if !defined(lint)
__RCSID("$NetBSD: refuse.c,v 1.80 2007/11/05 13:38:27 pooka Exp $");
__RCSID("$NetBSD: refuse.c,v 1.81 2007/11/05 13:41:52 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
#include <assert.h>
#include <err.h>
#include <errno.h>
#include <fuse.h>
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef MULTITHREADED_REFUSE
#include <pthread.h>
#endif
#include "defs.h"
typedef uint64_t fuse_ino_t;
struct fuse_config {

12
lib/librefuse/refuse_opt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: refuse_opt.c,v 1.12 2007/10/06 07:21:02 xtraeme Exp $ */
/* $NetBSD: refuse_opt.c,v 1.13 2007/11/05 13:41:52 pooka Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@ -34,10 +34,14 @@
* options or pass values for the matching options.
*/
#include "defs.h"
#include "fuse.h"
#include "fuse_opt.h"
#include <sys/types.h>
#include <err.h>
#include <fuse.h>
#include <fuse_opt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef FUSE_OPT_DEBUG
#define DPRINTF(x) do { printf x; } while ( /* CONSTCOND */ 0)