diff options
| author | Daniel Mierswa | 2009-08-17 07:27:39 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-08-17 11:15:59 +0200 |
| commit | c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed (patch) | |
| tree | 6d4671545542031f67face36783f8ad64b29057c /text-utils | |
| parent | libblkid: fix cache->probe memory leak (diff) | |
| download | kernel-qcow2-util-linux-c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed.tar.gz kernel-qcow2-util-linux-c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed.tar.xz kernel-qcow2-util-linux-c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed.zip | |
replace bcopy,bzero,index and rindex
Those 4 functions are marked as LEGACY in POSIX.1-2001 and removed in
POSIX.1-2008.
Replaced with memmove,memset,strchr and strrchr.
Signed-off-by: Daniel Mierswa <impulze@impulze.org>
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/colcrt.c | 4 | ||||
| -rw-r--r-- | text-utils/display.c | 2 | ||||
| -rw-r--r-- | text-utils/parse.c | 8 | ||||
| -rw-r--r-- | text-utils/ul.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c index 891fd86db..6f796656d 100644 --- a/text-utils/colcrt.c +++ b/text-utils/colcrt.c @@ -252,8 +252,8 @@ void pflush(int ol) } putwchar('\n'); } - bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t)); - bzero(page[267- ol], ol * 132 * sizeof(wchar_t)); + memmove(page, page[ol], (267 - ol) * 132 * sizeof(wchar_t)); + memset(page[267- ol], '\0', ol * 132 * sizeof(wchar_t)); outline -= ol; outcol = 0; first = 1; diff --git a/text-utils/display.c b/text-utils/display.c index 3d4bdcd98..91857c2fa 100644 --- a/text-utils/display.c +++ b/text-utils/display.c @@ -163,7 +163,7 @@ static void bpad(PR *pr) pr->cchar[0] = 's'; pr->cchar[1] = 0; for (p1 = pr->fmt; *p1 != '%'; ++p1); - for (p2 = ++p1; *p1 && index(spec, *p1); ++p1); + for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1); while ((*p2++ = *p1++) != 0) ; } diff --git a/text-utils/parse.c b/text-utils/parse.c index d7a302082..8164c601c 100644 --- a/text-utils/parse.c +++ b/text-utils/parse.c @@ -64,7 +64,7 @@ void addfile(char *name) exit(1); } while (fgets(buf, sizeof(buf), fp)) { - if ((p = index(buf, '\n')) == NULL) { + if ((p = strchr(buf, '\n')) == NULL) { (void)fprintf(stderr, _("hexdump: line too long.\n")); while ((ch = getchar()) != '\n' && ch != EOF); continue; @@ -171,7 +171,7 @@ int size(FS *fs) * skip any special chars -- save precision in * case it's a %s format. */ - while (index(spec + 1, *++fmt)); + while (strchr(spec + 1, *++fmt)); if (*fmt == '.' && isdigit((unsigned char)*++fmt)) { prec = atoi(fmt); while (isdigit((unsigned char)*++fmt)); @@ -244,10 +244,10 @@ void rewrite(FS *fs) if (fu->bcnt) { sokay = USEBCNT; /* skip to conversion character */ - for (++p1; index(spec, *p1); ++p1); + for (++p1; strchr(spec, *p1); ++p1); } else { /* skip any special chars, field width */ - while (index(spec + 1, *++p1)); + while (strchr(spec + 1, *++p1)); if (*p1 == '.' && isdigit((unsigned char)*++p1)) { sokay = USEPREC; diff --git a/text-utils/ul.c b/text-utils/ul.c index 76c0a9703..a1491b846 100644 --- a/text-utils/ul.c +++ b/text-utils/ul.c @@ -42,7 +42,7 @@ #include <stdio.h> #include <unistd.h> /* for getopt(), isatty() */ -#include <string.h> /* for bzero(), strcpy() */ +#include <string.h> /* for memset(), strcpy() */ #include <term.h> /* for setupterm() */ #include <stdlib.h> /* for getenv() */ #include <limits.h> /* for INT_MAX */ |