Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-10 14:44:02 -08:00
parent 7f7087d8bd 2948fe19f6
commit 2c1c862c1a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zfs/lib/libspl/Makefile.in
View File

@ -1,5 +1,6 @@
subdir-m += include subdir-m += include
DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c u8_textprep.c DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c
DISTFILES += u8_textprep.c getexecname.c
LIBRARY := libspl LIBRARY := libspl
@ -21,3 +22,5 @@ ${LIBRARY}-objs += list.o
${LIBRARY}-objs += strlcat.o ${LIBRARY}-objs += strlcat.o
${LIBRARY}-objs += strnlen.o ${LIBRARY}-objs += strnlen.o
${LIBRARY}-objs += u8_textprep.o ${LIBRARY}-objs += u8_textprep.o
${LIBRARY}-objs += getexecname.o

1
zfs/lib/libspl/strlcat.c
View File

@ -27,7 +27,6 @@
#pragma ident "%Z%%M% %I% %E% SMI" #pragma ident "%Z%%M% %I% %E% SMI"
#include <string.h> #include <string.h>
#include <sys/types.h>
/* /*
* Appends src to the dstsize buffer at dst. The append will never * Appends src to the dstsize buffer at dst. The append will never

1
zfs/lib/libspl/strlcpy.c
View File

@ -27,7 +27,6 @@
#pragma ident "%Z%%M% %I% %E% SMI" #pragma ident "%Z%%M% %I% %E% SMI"
#include <string.h> #include <string.h>
#include <sys/types.h>
/* /*
* Copies src to the dstsize buffer at dst. The copy will never * Copies src to the dstsize buffer at dst. The copy will never

1
zfs/lib/libspl/strnlen.c
View File

@ -27,7 +27,6 @@
#pragma ident "%Z%%M% %I% %E% SMI" #pragma ident "%Z%%M% %I% %E% SMI"
#include <string.h> #include <string.h>
#include <sys/types.h>
/* /*
* Returns the number of non-NULL bytes in string argument, * Returns the number of non-NULL bytes in string argument,