summaryrefslogtreecommitdiffstats
path: root/mount/lomount.c
diff options
context:
space:
mode:
authorDavidlohr Bueso2010-11-16 14:47:35 +0100
committerKarel Zak2010-11-23 21:06:49 +0100
commit8abcf2900297c6d53ead867c42f7c1688e8d52ca (patch)
tree77e2d666cd76d9d4c37e1c1864415c1e52d37926 /mount/lomount.c
parentlibblkid: cache is incorrectly revalidated (diff)
downloadkernel-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 'mount/lomount.c')
-rw-r--r--mount/lomount.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mount/lomount.c b/mount/lomount.c
index 03aae4b2a..d6556fc71 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -18,7 +18,7 @@
#include "loop.h"
#include "lomount.h"
-#include "xstrncpy.h"
+#include "strutils.h"
#include "nls.h"
#include "sundries.h"
#include "xmalloc.h"
@@ -886,7 +886,7 @@ find_unused_loop_device (void) {
#include <getopt.h>
#include <stdarg.h>
-#include "strtosize.h"
+#include "strutils.h"
static void
usage(FILE *f) {