diff options
| author | Davidlohr Bueso | 2010-11-16 14:47:35 +0100 |
|---|---|---|
| committer | Karel Zak | 2010-11-23 21:06:49 +0100 |
| commit | 8abcf2900297c6d53ead867c42f7c1688e8d52ca (patch) | |
| tree | 77e2d666cd76d9d4c37e1c1864415c1e52d37926 /disk-utils | |
| parent | libblkid: cache is incorrectly revalidated (diff) | |
| download | kernel-qcow2-util-linux-8abcf2900297c6d53ead867c42f7c1688e8d52ca.tar.gz kernel-qcow2-util-linux-8abcf2900297c6d53ead867c42f7c1688e8d52ca.tar.xz kernel-qcow2-util-linux-8abcf2900297c6d53ead867c42f7c1688e8d52ca.zip | |
lib: [strutils] general purpose string handling functions
This patch replaces a few functions used throughout the source:
* Renames getnum (from schedutils) to strtol_or_err
* Moves strtosize (from lib/strtosize.c)
* Moves xstrncpy (from include/xstrncpy.h)
* Adds strnlen, strnchr and strndup if not available (remove it from libmount utils)
A few Makefile.am files were modified to compile accordingly along with trivial renaming
in schedutils source code.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Diffstat (limited to 'disk-utils')
| -rw-r--r-- | disk-utils/mkswap.c | 2 | ||||
| -rw-r--r-- | disk-utils/swaplabel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 246b8dd7f..3d14a42e5 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -48,7 +48,7 @@ #include "linux_version.h" #include "swapheader.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "blkdev.h" #include "pathnames.h" diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c index 634197226..9dc20b49e 100644 --- a/disk-utils/swaplabel.c +++ b/disk-utils/swaplabel.c @@ -33,7 +33,7 @@ #include "c.h" #include "writeall.h" #include "swapheader.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #define SWAP_UUID_OFFSET (offsetof(struct swap_header_v1_2, uuid)) |