This email list is read-only. Emails sent to this list will be discarded
----------------------------------
configure.in | 3 -
moblin-system-daemon/datetime/Makefile.am | 6 +-
moblin-system-daemon/datetime/datetime.c | 97 +++++++++++++----------------
3 files changed, 45 insertions(+), 61 deletions(-)
New commits:
commit 262344d9d15a53b2f94bdf5809529b1ef3f50bf8
Author: Todd Brandt <[EMAIL PROTECTED]>
Date: Mon Aug 4 15:57:27 2008 -0700
removed the liboobs library dependency and some datetime warnings
Diff in this email is a maximum of 400 lines.
diff --git a/configure.in b/configure.in
index 4e9ae32..b164422 100644
--- a/configure.in
+++ b/configure.in
@@ -131,9 +131,6 @@ AC_ARG_ENABLE(datetime,
AM_CONDITIONAL(HAVE_DATETIME, test x$enable_datetime = xyes)
if test "$enable_datetime" = "yes"; then
AC_DEFINE(HAVE_DATETIME, [1], [Include the datetime module])
- PKG_CHECK_MODULES(DATETIME, liboobs-1 >= 2.17.5)
- AC_SUBST(DATETIME_CFLAGS)
- AC_SUBST(DATETIME_LIBS)
AC_CONFIG_FILES([moblin-system-daemon/datetime/Makefile])
fi
diff --git a/moblin-system-daemon/datetime/Makefile.am
b/moblin-system-daemon/datetime/Makefile.am
index 594a2ec..2e7d001 100644
--- a/moblin-system-daemon/datetime/Makefile.am
+++ b/moblin-system-daemon/datetime/Makefile.am
@@ -3,12 +3,10 @@ noinst_LTLIBRARIES = libdatetime.la
INCLUDES= \
-I$(top_srcdir)/moblin-system-daemon \
-I$(top_srcdir)/moblin-system-daemon/datetime \
- $(COMMON_CFLAGS) \
- $(DATETIME_CFLAGS)
+ $(COMMON_CFLAGS)
libdatetime_la_SOURCES = \
datetime.c datetime.h
libdatetime_la_LIBADD = \
- $(COMMON_LIBS) \
- $(DATETIME_LIBS)
+ $(COMMON_LIBS)
diff --git a/moblin-system-daemon/datetime/datetime.c
b/moblin-system-daemon/datetime/datetime.c
index 2b5dace..cb3e5c0 100644
--- a/moblin-system-daemon/datetime/datetime.c
+++ b/moblin-system-daemon/datetime/datetime.c
@@ -2,7 +2,6 @@
#include <stdlib.h>
#include <string.h>
#include "moblin-system-dbus.h"
-#include <oobs/oobs.h>
// lilli
#include <sys/time.h>
@@ -49,10 +48,10 @@ system_daemon_set_time(MoblinSystemServer * server,
if(timev->tv_sec == -1)
{
// TODO: set GError error here
- printf("mktime() failed.\n");
+ PRINTF("mktime() failed.\n");
return FALSE;
}
- printf("mktime() successful.\n");
+ PRINTF("mktime() successful.\n");
// This function does not support milliseconds
timev->tv_usec = 0;
@@ -61,12 +60,12 @@ system_daemon_set_time(MoblinSystemServer * server,
if(retVal)
{
// TODO: set GError error here
- printf("settimeofday() failed: errno= %s\n", strerror(errno));
+ PRINTF("settimeofday() failed: errno= %s\n", strerror(errno));
return FALSE;
}
- printf("settimeofday() was successful.\n");
+ PRINTF("settimeofday() was successful.\n");
- printf ( "The time and date was set to: %s", asctime (time) );
+ PRINTF ( "The time and date was set to: %s", asctime (time) );
return TRUE;
}
@@ -88,21 +87,21 @@ system_daemon_get_time(MoblinSystemServer * server,
if(retVal)
{
// TODO: set GError error here
- printf("gettimeofday() failed: errno= %s\n", strerror(errno));
+ PRINTF("gettimeofday() failed: errno= %s\n", strerror(errno));
return FALSE;
}
- printf("gettimeofday() successful.\n");
+ PRINTF("gettimeofday() successful.\n");
getTime = localtime(&timev.tv_sec);
if(getTime == NULL)
{
// TODO: set GError error here
- printf("localtime() failed.\n");
+ PRINTF("localtime() failed.\n");
return FALSE;
}
- printf ( "The current time and date is: %s", asctime (getTime) );
+ PRINTF ( "The current time and date is: %s", asctime (getTime) );
*year = (gint)(getTime->tm_year + 1900);
*month = (gint)(getTime->tm_mon + 1);
@@ -144,7 +143,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
pFile = fopen("/usr/share/zoneinfo/zone.tab", "r");
if(pFile == NULL)
{
- printf("Error opening file. errno = %s\n", strerror(errno));
+ PRINTF("Error opening file. errno = %s\n", strerror(errno));
return FALSE;
}
@@ -152,15 +151,15 @@ system_daemon_get_all_timezones(MoblinSystemServer *
server,
fileLen = ftell(pFile);
rewind(pFile);
- printf("length of file: %d\n", fileLen);
+ PRINTF("length of file: %d\n", (int)fileLen);
if(fileLen == 0)
{
- printf("Error seeking length.\n");
+ PRINTF("Error seeking length.\n");
return FALSE;
}
- printf("allocating buffer and zones\n");
+ PRINTF("allocating buffer and zones\n");
buffer = (char*)malloc(sizeof(char) * fileLen);
memset(buffer, '\0', fileLen);
@@ -171,13 +170,13 @@ system_daemon_get_all_timezones(MoblinSystemServer *
server,
if(tz_list == NULL || buffer == NULL)
{
- printf("Memory error. errno = %s\n", strerror(errno));
+ PRINTF("Memory error. errno = %s\n", strerror(errno));
return FALSE;
}
if (fread (buffer, sizeof(char), fileLen, pFile) != fileLen)
{
- printf("Reading error. errno = %s\n", strerror(errno));
+ PRINTF("Reading error. errno = %s\n", strerror(errno));
return FALSE;
}
@@ -186,7 +185,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
{
optionsBitMask = 8; // 0b00001000
- printf("tok = \t\"%s\"\n", tok);
+ PRINTF("tok = \t\"%s\"\n", tok);
if(tok[0] != '#')
{
orig = origIter = tok;//(char*)malloc(sizeof(char) *
(strlen(tok)+2));
@@ -199,7 +198,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
{
while(optionsBitMask > 0)
{
-
//printf("optionsBitMask=%d\tflags=%d\t(optionsBitMask&options)=%d\n",
optionsBitMask, options, (optionsBitMask & options));
+
//PRINTF("optionsBitMask=%d\tflags=%d\t(optionsBitMask&options)=%d\n",
optionsBitMask, options, (optionsBitMask & options));
tabIter = strpbrk(origIter, "\t");
if(!tabIter)
@@ -211,8 +210,8 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
{
strncpy(copyIter, origIter,
substrlen);
- //printf("origIter =
\t\"%s\"\n", origIter);
- //printf("copyIter =
\t\"%s\"\n", copyIter);
+ //PRINTF("origIter =
\t\"%s\"\n", origIter);
+ //PRINTF("copyIter =
\t\"%s\"\n", copyIter);
copyIter += substrlen;
copyIter[0] = '\0';
@@ -227,7 +226,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
strncpy(copy, orig, (strlen(orig)+1));
}
- printf("copy = \t\"%s\"\n", copy);
+ PRINTF("copy = \t\"%s\"\n", copy);
if(arrIter > arrLen - 1)
{
@@ -254,51 +253,51 @@ system_daemon_set_timezone(MoblinSystemServer * server,
struct stat buffer;
int retVal = 0;
- printf("Checking for configured timezone (symlink from /etc... to
/usr... exists)...\n");
+ PRINTF("Checking for configured timezone (symlink from /etc... to
/usr... exists)...\n");
retVal = lstat(path, &buffer);
if(!retVal) // lstat succeeded
{
- printf("lstat() successful.\n");
+ PRINTF("lstat() successful.\n");
if(S_ISLNK(buffer.st_mode)) // there is a symbolic link between
/etc/localtime and /usr/zoneinfo/...
{
- printf("Configured timezone. Removing timezone
(removing symlink)...\n");
+ PRINTF("Configured timezone. Removing timezone
(removing symlink)...\n");
retVal = unlink(path);
if(retVal)
{
// TODO: set GError error here
- printf("ulink() failed: errno = %s\n",
strerror(errno));
+ PRINTF("ulink() failed: errno = %s\n",
strerror(errno));
return FALSE;
}
- printf("unlink() successful.\n");
- printf("Timezone (symlink) removed.\n");
+ PRINTF("unlink() successful.\n");
+ PRINTF("Timezone (symlink) removed.\n");
}
else // /etc/localtime exists, but there is no link to anything
{
- printf("No configured timezone.\n");
+ PRINTF("No configured timezone.\n");
}
}
else if(errno != ENOENT) // lstat failed()
{
// TODO: set GError error here
- printf("lstat() failed: errno= %s\n", strerror(errno));
+ PRINTF("lstat() failed: errno= %s\n", strerror(errno));
return FALSE;
}
else // lstat() failed because the file (/etc/localtime) did not exist
{
- printf("No configured timezone.\n");
+ PRINTF("No configured timezone.\n");
}
- printf("Configuring timezone...\n");
+ PRINTF("Configuring timezone...\n");
retVal = symlink(tz, path);
if(retVal)
{
// TODO: set GError error here
- printf("symlink() failed: errno = %s\n", strerror(errno));
+ PRINTF("symlink() failed: errno = %s\n", strerror(errno));
return FALSE;
}
- printf("symlink() succesful.\n");
- printf("Timezone configured.\n");
+ PRINTF("symlink() succesful.\n");
+ PRINTF("Timezone configured.\n");
return TRUE;
}
@@ -313,7 +312,7 @@ system_daemon_get_timezone(MoblinSystemServer * server,
int retVal = 0;
int len = 0;
- printf("Checking for configured timezone (symlink from /etc... to
/usr... exists)...\n");
+ PRINTF("Checking for configured timezone (symlink from /etc... to
/usr... exists)...\n");
retVal = lstat(path, &buffer);
if(retVal) // lstat failed
{
@@ -322,29 +321,29 @@ system_daemon_get_timezone(MoblinSystemServer * server,
// TODO: set GError error here
*tz = NULL;
- printf("lstat() failed: errno= %s\n", strerror(errno));
+ PRINTF("lstat() failed: errno= %s\n", strerror(errno));
return FALSE;
}
else // lstat() failed because the file (/etc/localtime) did
not exist
{
- printf("No configured timezone.\n");
+ PRINTF("No configured timezone.\n");
*tz = NULL;
return TRUE;
}
}
- printf("lstat() successful.\n");
+ PRINTF("lstat() successful.\n");
if(!S_ISLNK(buffer.st_mode))
{
- printf("No configured timezone.\n");
+ PRINTF("No configured timezone.\n");
*tz = NULL;
return TRUE;
}
- printf("Timezone configured.\n");
+ PRINTF("Timezone configured.\n");
len = (size_t)buffer.st_size + 1;
@@ -357,7 +356,7 @@ system_daemon_get_timezone(MoblinSystemServer * server,
*tz = NULL;
// TODO: set GError error here
- printf("readlink() failed: errno= %s\n", strerror(errno));
+ PRINTF("readlink() failed: errno= %s\n", strerror(errno));
return FALSE;
}
@@ -367,28 +366,18 @@ system_daemon_get_timezone(MoblinSystemServer * server,
*tz = NULL;
// TODO: set GError error here
- printf("readlink() failed, buffer overflow: errno= %s\n",
strerror(errno));
+ PRINTF("readlink() failed, buffer overflow: errno= %s\n",
strerror(errno));
return FALSE;
}
- printf("readlink() successful.\n");
+ PRINTF("readlink() successful.\n");
*tz[len] = '\0';
- printf("Configured timezone is %s\n", *tz);
+ PRINTF("Configured timezone is %s\n", *tz);
return TRUE;
}
-static gboolean
-oobs_connect(MoblinSystemServer * server)
-{
-}
-
-static gboolean
-time_connect(MoblinSystemServer * server)
-{
-}
-
gboolean
initialize_datetime(MoblinSystemServer * server)
{
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
