[evolution-data-server] NULL vs. 0
- From: Kjartan Maraas <kmaraas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] NULL vs. 0
- Date: Fri, 25 Sep 2009 20:16:40 +0000 (UTC)
commit add3da6826cc9d86cfe78bc2ef7b3195fa18bdf9
Author: Kjartan Maraas <kmaraas gnome org>
Date: Fri Sep 25 22:16:12 2009 +0200
NULL vs. 0
calendar/tests/ecal/test-ecal.c | 2 +-
camel/camel-data-cache.c | 2 +-
camel/camel-list-utils.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/calendar/tests/ecal/test-ecal.c b/calendar/tests/ecal/test-ecal.c
index e52eccf..de537da 100644
--- a/calendar/tests/ecal/test-ecal.c
+++ b/calendar/tests/ecal/test-ecal.c
@@ -699,7 +699,7 @@ create_client (ECal **client, const gchar *uri, ECalSourceType type, gboolean on
results = all_tests (*client, uri);
cl_printf (*client, "\n\n\n*************Tests run: %d****************\n\n", tests_run);
cl_printf (*client, "*************Tests passed: %d*************\n\n\n", tests_passed);
- if (results != 0)
+ if (results != NULL)
cl_printf (*client, "***Failures********%s\n", results);
cl_printf (*client, "dump of the test calendar data");
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index 5c38240..09be951 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -254,7 +254,7 @@ data_cache_path(CamelDataCache *cdc, gint create, const gchar *path, const gchar
dd(printf("Checking expire cycle time on dir '%s'\n", dir));
/* This has a race, but at worst we re-run an expire cycle which is safe */
- now = time(0);
+ now = time(NULL);
if (cdc->priv->expire_last[hash] + CAMEL_DATA_CACHE_CYCLE_TIME < now) {
cdc->priv->expire_last[hash] = now;
data_cache_expire(cdc, dir, key, now);
diff --git a/camel/camel-list-utils.h b/camel/camel-list-utils.h
index e75ef23..a30b1f3 100644
--- a/camel/camel-list-utils.h
+++ b/camel/camel-list-utils.h
@@ -72,7 +72,7 @@ struct _CamelDList {
struct _CamelDListNode *tailpred;
};
-#define CAMEL_DLIST_INITIALISER(l) { (CamelDListNode *)&l.tail, 0, (CamelDListNode *)&l.head }
+#define CAMEL_DLIST_INITIALISER(l) { (CamelDListNode *)&l.tail, NULL, (CamelDListNode *)&l.head }
void camel_dlist_init(CamelDList *v);
CamelDListNode *camel_dlist_addhead(CamelDList *l, CamelDListNode *n);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]