]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
import: use parse_percent() where appropriate
authorLennart Poettering <lennart@poettering.net>
Wed, 10 Oct 2018 19:00:03 +0000 (21:00 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 26 Nov 2018 17:09:01 +0000 (18:09 +0100)
src/import/importd.c

index 8416d78e7dec22e289463062200b5b143164e25b..260705bcad737d95dba43c57cbd61bec099e71e5 100644 (file)
@@ -510,7 +510,6 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void
         struct ucred *ucred = NULL;
         Manager *m = userdata;
         struct cmsghdr *cmsg;
-        unsigned percent;
         char *p, *e;
         Transfer *t;
         Iterator i;
@@ -566,15 +565,15 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void
         e = strchrnul(p, '\n');
         *e = 0;
 
-        r = safe_atou(p, &percent);
-        if (r < 0 || percent > 100) {
+        r = parse_percent(p);
+        if (r < 0) {
                 log_warning("Got invalid percent value, ignoring.");
                 return 0;
         }
 
-        t->progress_percent = percent;
+        t->progress_percent = (unsigned) r;
 
-        log_debug("Got percentage from client: %u%%", percent);
+        log_debug("Got percentage from client: %u%%", t->progress_percent);
         return 0;
 }