Changeset 8595b954 in mainline

Timestamp:

2012-09-18T19:54:56Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0d8322da

Parents:

ce1df04 (diff), df7f9fb5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:rtc-helenos.

File:

• uspace/app/date/date.c (modified) (5 diffs)

uspace/app/date/date.c

@@ -41 +41 @@
 static int read_date_from_arg(char *wdate, struct tm *t);
 static int read_time_from_arg(char *wdate, struct tm *t);
-static int read_num_from_str(char *str, size_t len, int *n);
 static int tm_sanity_check(struct tm *t);
 static bool is_leap_year(int year);
@@ -202 +201 @@
 {
         int rc;
+        uint32_t tmp;
 
         if (str_size(wdate) != 10) /* str_size("DD/MM/YYYY") == 10 */
@@ -211 +211 @@
         }
 
-        rc = read_num_from_str(&wdate[0], 2, &t->tm_mday);
+        rc = str_uint32_t(&wdate[0], NULL, 10, false, &tmp);
         if (rc != EOK)
                 return rc;
 
-        rc = read_num_from_str(&wdate[3], 2, &t->tm_mon);
+        t->tm_mday = tmp;
+
+        rc = str_uint32_t(&wdate[3], NULL, 10, false, &tmp);
         if (rc != EOK)
                 return rc;
-        t->tm_mon--;
-
-        rc = read_num_from_str(&wdate[6], 4, &t->tm_year);
-        t->tm_year -= 1900;
+
+        t->tm_mon = tmp - 1;
+
+        rc = str_uint32_t(&wdate[6], NULL, 10, false, &tmp);
+        t->tm_year = tmp - 1900;
+
         return rc;
 }
@@ -234 +238 @@
         size_t len = str_size(wtime);
         bool sec_present = len == 8;
+        uint32_t tmp;
 
         /* str_size("HH:MM") == 5 */
@@ -246 +251 @@
                 return EINVAL;
 
-        rc = read_num_from_str(&wtime[0], 2, &t->tm_hour);
+        rc = str_uint32_t(&wtime[0], NULL, 10, false, &tmp);
         if (rc != EOK)
                 return rc;
 
-        rc = read_num_from_str(&wtime[3], 2, &t->tm_min);
+        t->tm_hour = tmp;
+
+        rc = str_uint32_t(&wtime[3], NULL, 10, false, &tmp);
         if (rc != EOK)
                 return rc;
 
-        if (sec_present)
-                rc = read_num_from_str(&wtime[6], 2, &t->tm_sec);
-        else
+        t->tm_min = tmp;
+
+        if (sec_present) {
+                rc = str_uint32_t(&wtime[6], NULL, 10, false, &tmp);
+                t->tm_sec = tmp;
+        } else
                 t->tm_sec = 0;
 
         return rc;
-}
-
-static int
-read_num_from_str(char *str, size_t len, int *n)
-{
-        size_t i;
-
-        *n = 0;
-
-        for (i = 0; i < len; ++i, ++str) {
-                if (!isdigit(*str))
-                        return EINVAL;
-                *n *= 10;
-                *n += *str - '0';
-        }
-
-        return EOK;
 }