]> sourceware.org Git - dm.git/commitdiff
Avoid sscanf %as for uClibc
authorAlasdair Kergon <agk@redhat.com>
Fri, 19 Mar 2004 15:52:22 +0000 (15:52 +0000)
committerAlasdair Kergon <agk@redhat.com>
Fri, 19 Mar 2004 15:52:22 +0000 (15:52 +0000)
dmsetup/dmsetup.c

index cec22e5578047f32ad2693f56b90906734328598..808027cb18b71904ef3e2c0329c8369b682940d5 100644 (file)
@@ -63,7 +63,7 @@ static char *_uuid;
  */
 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;
        unsigned long long start, size;
        int r = 0, n, line = 0;
@@ -94,8 +94,8 @@ static int _parse_file(struct dm_task *dmt, const char *file)
                if (!*ptr || *ptr == '#')
                        continue;
 
-               if (sscanf(ptr, "%llu %llu %as %n",
-                          &start, &size, &ttype, &n) < 3) {
+               if (sscanf(ptr, "%llu %llu %s %n",
+                          &start, &size, ttype, &n) < 3) {
                        err("%s:%d Invalid format", file, line);
                        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))
                        goto out;
-
-               free(ttype);
        }
        r = 1;
 
This page took 0.028877 seconds and 5 git commands to generate.