First version, development moved to 5110-connected machine

[gnokii.git] / common / gsm-datetime.c

diff --git a/common/gsm-datetime.c b/common/gsm-datetime.c
index 589dcb3..13756b0 100644 (file)
--- a/common/gsm-datetime.c
+++ b/common/gsm-datetime.c
@@ -8,14 +8,16 @@
 
 */
 
-#include <string.h>\r
-#include <time.h>\r
-\r
-#include "misc.h"\r
-#include "gsm-datetime.h"\r
-#include "gsm-common.h"\r
+#include "config.h"
 
-char DayOfWeekChar;
+#include <string.h>
+#include <time.h>
+
+#include "misc.h"
+#include "gsm-datetime.h"
+#include "gsm-common.h"
+
+static char DayOfWeekChar;
 
 /* Based on article in Polish PC-Kurier 8/1998 page 104 */
 /* Archive on http://www.pckurier.pl */
@@ -37,7 +39,9 @@ char *DayOfWeek (int year, int month, int day) {
     case 6: strcpy(&DayOfWeekChar,"Sat"); break;
   }
   return &DayOfWeekChar;
-}\r
+}
+
+#ifndef UCLINUX
 
 /* GetMachineDateTime ----------------------------------------------------------
 Purpose:    Gets system date and time.
@@ -47,42 +51,44 @@ Output:   date - System date in the format "aaaa-mm-gg".
           time  - System time in the format "hh:mm:ss".
 Return:  -
 ----------------------------------------------------------------------------- */
-void GetMachineDateTime( char nowdate[], char nowtime[] )\r
-{\r
-  struct tm *now;\r
-  time_t nowh;\r
-\r
-  nowh=time(NULL);\r
-  now=localtime(&nowh);\r
-\r
-  /* I have 100 (for 2000) Year now :-) */\r
-  if (now->tm_year>99 && now->tm_year<1900) {\r
-    now->tm_year=now->tm_year+1900;\r
-  }\r
-\r
+static void GetMachineDateTime( char nowdate[], char nowtime[] )
+{
+  struct tm *now;
+  time_t nowh;
+
+  nowh=time(NULL);
+  now=localtime(&nowh);
+
+  /* I have 100 (for 2000) Year now :-) */
+  if (now->tm_year>99 && now->tm_year<1900) {
+    now->tm_year=now->tm_year+1900;
+  }
+
   sprintf(nowdate,"%04d-%02d-%02d",now->tm_year,now->tm_mon+1,now->tm_mday);
-  sprintf(nowtime, "%02d:%02d:%02d",now->tm_hour,now->tm_min,now->tm_sec);\r
-\r
-}\r
-\r
-void EncodeDateTime(unsigned char* buffer, GSM_DateTime *datetime)\r
-{\r
-  buffer[0] = datetime->Year / 256;\r
-  buffer[1] = datetime->Year % 256;\r
-  buffer[2] = datetime->Month;\r
-  buffer[3] = datetime->Day;\r
-\r
-  buffer[4] = datetime->Hour;\r
-  buffer[5] = datetime->Minute;\r
-}\r
-\r
-void DecodeDateTime(unsigned char* buffer, GSM_DateTime *datetime)\r
-{\r
-  datetime->Year = buffer[0] * 256 + buffer[1];\r
-  datetime->Month = buffer[2];\r
-  datetime->Day = buffer[3];\r
-\r
-  datetime->Hour = buffer[4];\r
-  datetime->Minute = buffer[5];\r
-  datetime->Second = buffer[6];\r
-}\r
+  sprintf(nowtime, "%02d:%02d:%02d",now->tm_hour,now->tm_min,now->tm_sec);
+
+}
+
+void EncodeDateTime(unsigned char* buffer, GSM_DateTime *datetime)
+{
+  buffer[0] = datetime->Year / 256;
+  buffer[1] = datetime->Year % 256;
+  buffer[2] = datetime->Month;
+  buffer[3] = datetime->Day;
+
+  buffer[4] = datetime->Hour;
+  buffer[5] = datetime->Minute;
+}
+
+#endif /* UCLINUX */
+
+void DecodeDateTime(unsigned char* buffer, GSM_DateTime *datetime)
+{
+  datetime->Year = buffer[0] * 256 + buffer[1];
+  datetime->Month = buffer[2];
+  datetime->Day = buffer[3];
+
+  datetime->Hour = buffer[4];
+  datetime->Minute = buffer[5];
+  datetime->Second = buffer[6];
+}