Changes in uspace/lib/c/generic/time.c [b7fd2a0:38d150e] in mainline

File:

• uspace/lib/c/generic/time.c (modified) (8 diffs)

uspace/lib/c/generic/time.c

@@ -585 +585 @@
         if (clock_conn == NULL) {
                 category_id_t cat_id;
-                errno_t rc = loc_category_get_id("clock", &cat_id, IPC_FLAG_BLOCKING);
+                int rc = loc_category_get_id("clock", &cat_id, IPC_FLAG_BLOCKING);
                 if (rc != EOK)
                         goto fallback;
@@ -617 +617 @@
         
         struct tm time;
-        errno_t rc = clock_dev_time_get(clock_conn, &time);
+        int rc = clock_dev_time_get(clock_conn, &time);
         if (rc != EOK)
                 goto fallback;
@@ -634 +634 @@
         if (ktime == NULL) {
                 uintptr_t faddr;
-                errno_t rc = sysinfo_get_value("clock.faddr", &faddr);
+                int rc = sysinfo_get_value("clock.faddr", &faddr);
                 if (rc != EOK) {
                         errno = rc;
@@ -954 +954 @@
  * @param result Structure to store the result to
  *
- * @return EOK or an error code
- *
- */
-errno_t time_utc2tm(const time_t time, struct tm *restrict result)
+ * @return EOK or a negative error code
+ *
+ */
+int time_utc2tm(const time_t time, struct tm *restrict result)
 {
         assert(result != NULL);
@@ -984 +984 @@
  *             ASCTIME_BUF_LEN bytes long.
  *
- * @return EOK or an error code.
- *
- */
-errno_t time_utc2str(const time_t time, char *restrict buf)
+ * @return EOK or a negative error code.
+ *
+ */
+int time_utc2str(const time_t time, char *restrict buf)
 {
         struct tm tm;
-        errno_t ret = time_utc2tm(time, &tm);
+        int ret = time_utc2tm(time, &tm);
         if (ret != EOK)
                 return ret;
@@ -1036 +1036 @@
  * @param result Structure to store the result to.
  *
- * @return EOK on success or an error code.
- *
- */
-errno_t time_tv2tm(const struct timeval *tv, struct tm *restrict result)
+ * @return EOK on success or a negative error code.
+ *
+ */
+int time_tv2tm(const struct timeval *tv, struct tm *restrict result)
 {
         // TODO: Deal with timezones.
@@ -1066 +1066 @@
  * @param result Structure to store the result to.
  *
- * @return EOK on success or an error code.
- *
- */
-errno_t time_local2tm(const time_t time, struct tm *restrict result)
+ * @return EOK on success or a negative error code.
+ *
+ */
+int time_local2tm(const time_t time, struct tm *restrict result)
 {
         struct timeval tv = {
@@ -1088 +1088 @@
  *              ASCTIME_BUF_LEN bytes long.
  *
- * @return EOK on success or an error code.
- *
- */
-errno_t time_local2str(const time_t time, char *buf)
+ * @return EOK on success or a negative error code.
+ *
+ */
+int time_local2str(const time_t time, char *buf)
 {
         struct tm loctime;
-        errno_t ret = time_local2tm(time, &loctime);
+        int ret = time_local2tm(time, &loctime);
         if (ret != EOK)
                 return ret;