Changeset 664fc031 in mainline

Timestamp:

2012-08-22T18:53:13Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2e6293b

Parents:

077dad2

Message:

rename the new time functions to the time_* naming scheme

Location:

uspace

Files:

• drv/time/cmos-rtc/cmos-rtc.c (modified) (1 diff)
• lib/c/generic/time.c (modified) (5 diffs)
• lib/c/include/sys/time.h (modified) (1 diff)
• lib/posix/time.c (modified) (3 diffs)

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -312 +312 @@
                 fibril_mutex_unlock(&rtc->mutex);
 
-                return localtime2tm(cur_time, t);
+                return time_local2tm(cur_time, t);
         }
 

uspace/lib/c/generic/time.c

@@ -849 +849 @@
  * @return        EOK or a negative error code
  */
-int utctime2tm(const time_t time, struct tm *restrict result)
+int time_utc2tm(const time_t time, struct tm *restrict result)
 {
         assert(result != NULL);
@@ -876 +876 @@
  * @return       EOK or a negative error code.
  */
-int utctime2str(const time_t time, char *restrict buf)
+int time_utc2str(const time_t time, char *restrict buf)
 {
         struct tm t;
         int r;
 
-        if ((r = utctime2tm(time, &t)) != EOK)
+        if ((r = time_utc2tm(time, &t)) != EOK)
                 return r;
 
-        tm2str(&t, buf);
+        time_tm2str(&t, buf);
         return EOK;
 }
@@ -897 +897 @@
  *                bytes long.
  */
-void tm2str(const struct tm *restrict timeptr, char *restrict buf)
+void time_tm2str(const struct tm *restrict timeptr, char *restrict buf)
 {
         assert(timeptr != NULL);
@@ -927 +927 @@
  * @return          EOK on success or a negative error code.
  */
-int localtime2tm(const time_t time, struct tm *restrict result)
+int time_local2tm(const time_t time, struct tm *restrict result)
 {
         // TODO: deal with timezone
@@ -957 +957 @@
  * @return       EOK on success or a negative error code.
  */
-int localtime2str(const time_t time, char *buf)
+int time_local2str(const time_t time, char *buf)
 {
         struct tm loctime;
         int r;
 
-        if ((r = localtime2tm(time, &loctime)) != EOK)
+        if ((r = time_local2tm(time, &loctime)) != EOK)
                 return r;
 
-        tm2str(&loctime, buf);
+        time_tm2str(&loctime, buf);
 
         return EOK;

uspace/lib/c/include/sys/time.h

@@ -81 +81 @@
 
 extern time_t mktime(struct tm *tm);
-extern int utctime2tm(const time_t time, struct tm *result);
-extern int utctime2str(const time_t time, char *buf);
-extern void tm2str(const struct tm *timeptr, char *buf);
-extern int localtime2tm(const time_t time, struct tm *result);
-extern int localtime2str(const time_t time, char *buf);
+extern int time_utc2tm(const time_t time, struct tm *result);
+extern int time_utc2str(const time_t time, char *buf);
+extern void time_tm2str(const struct tm *timeptr, char *buf);
+extern int time_local2tm(const time_t time, struct tm *result);
+extern int time_local2str(const time_t time, char *buf);
 extern double difftime(time_t time1, time_t time0);
 extern size_t strftime(char *restrict s, size_t maxsize,

uspace/lib/posix/time.c

@@ -87 +87 @@
     struct tm *restrict result)
 {
-        int rc = utctime2tm(*timer, result);
+        int rc = time_utc2tm(*timer, result);
         if (rc != EOK) {
                 errno = rc;
@@ -153 +153 @@
     char *restrict buf)
 {
-        tm2str(timeptr, buf);
+        time_tm2str(timeptr, buf);
         return buf;
 }
@@ -184 +184 @@
 char *posix_ctime_r(const time_t *timer, char *buf)
 {
-        int r = localtime2str(*timer, buf);
+        int r = time_local2str(*timer, buf);
         if (r != EOK) {
                 errno = r;