shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Avoid sscanf %as for uClibc

Browse Source
This commit is contained in:
Alasdair Kergon 2004-03-19 15:52:22 +00:00
parent 639c84c193
commit c9f25410c9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/dmsetup.c
View File

@ -63,7 +63,7 @@ static char *_uuid;
*/ */
static int _parse_file(struct dm_task *dmt, const char *file) static int _parse_file(struct dm_task *dmt, const char *file)
{ {
char buffer[LINE_SIZE], *ttype, *ptr, *comment; char buffer[LINE_SIZE], ttype[LINE_SIZE], *ptr, *comment;
FILE *fp; FILE *fp;
unsigned long long start, size; unsigned long long start, size;
int r = 0, n, line = 0; int r = 0, n, line = 0;
@ -94,8 +94,8 @@ static int _parse_file(struct dm_task *dmt, const char *file)
if (!*ptr || *ptr == '#') if (!*ptr || *ptr == '#')
continue; continue;
if (sscanf(ptr, "%llu %llu %as %n", if (sscanf(ptr, "%llu %llu %s %n",
&start, &size, &ttype, &n) < 3) { &start, &size, ttype, &n) < 3) {
err("%s:%d Invalid format", file, line); err("%s:%d Invalid format", file, line);
goto out; goto out;
} }
@ -106,8 +106,6 @@ static int _parse_file(struct dm_task *dmt, const char *file)
if (!dm_task_add_target(dmt, start, size, ttype, ptr)) if (!dm_task_add_target(dmt, start, size, ttype, ptr))
goto out; goto out;
free(ttype);
} }
r = 1; r = 1;