61 lines
2.8 KiB
Plaintext
61 lines
2.8 KiB
Plaintext
$OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.6 2012/03/29 06:45:21 ajacoutot Exp $
|
|
|
|
On OpenBSD, time_t is an int.
|
|
|
|
--- camel/camel-search-sql-sexp.c.orig Fri Mar 23 23:14:46 2012
|
|
+++ camel/camel-search-sql-sexp.c Fri Mar 23 23:15:37 2012
|
|
@@ -188,7 +188,7 @@ eval_eq (struct _CamelSExp *f,
|
|
if (r1->type == CAMEL_SEXP_RES_INT)
|
|
g_string_append_printf(str, "%d", r1->value.number);
|
|
else if (r1->type == CAMEL_SEXP_RES_TIME)
|
|
- g_string_append_printf(str, "%ld", r1->value.time);
|
|
+ g_string_append_printf(str, "%d", r1->value.time);
|
|
else if (r1->type == CAMEL_SEXP_RES_STRING)
|
|
g_string_append_printf(str, "%s", r1->value.string);
|
|
|
|
@@ -206,7 +206,7 @@ eval_eq (struct _CamelSExp *f,
|
|
if (r2->type == CAMEL_SEXP_RES_BOOL)
|
|
g_string_append_printf(str, "%d", r2->value.boolean);
|
|
else if (r2->type == CAMEL_SEXP_RES_TIME)
|
|
- g_string_append_printf(str, "%ld", r2->value.time);
|
|
+ g_string_append_printf(str, "%d", r2->value.time);
|
|
else if (r2->type == CAMEL_SEXP_RES_STRING) {
|
|
gchar *tmp = g_strdup_printf("%c%s%c", ut ? '%':' ', r2->value.string, ut?'%':' ');
|
|
gchar *safe = get_db_safe_string (tmp);
|
|
@@ -244,7 +244,7 @@ eval_lt (struct _CamelSExp *f,
|
|
if (r1->type == CAMEL_SEXP_RES_INT)
|
|
g_string_append_printf(str, "%d", r1->value.number);
|
|
else if (r1->type == CAMEL_SEXP_RES_TIME)
|
|
- g_string_append_printf(str, "%ld", r1->value.time);
|
|
+ g_string_append_printf(str, "%d", r1->value.time);
|
|
else if (r1->type == CAMEL_SEXP_RES_STRING)
|
|
g_string_append_printf(str, "%s", r1->value.string);
|
|
|
|
@@ -254,7 +254,7 @@ eval_lt (struct _CamelSExp *f,
|
|
if (r2->type == CAMEL_SEXP_RES_BOOL)
|
|
g_string_append_printf(str, "%d", r2->value.boolean);
|
|
else if (r2->type == CAMEL_SEXP_RES_TIME)
|
|
- g_string_append_printf(str, "%ld", r2->value.time);
|
|
+ g_string_append_printf(str, "%d", r2->value.time);
|
|
else if (r2->type == CAMEL_SEXP_RES_STRING)
|
|
g_string_append_printf(str, "%s", r2->value.string);
|
|
camel_sexp_result_free (f, r1);
|
|
@@ -286,7 +286,7 @@ eval_gt (struct _CamelSExp *f,
|
|
if (r1->type == CAMEL_SEXP_RES_INT)
|
|
g_string_append_printf(str, "%d", r1->value.number);
|
|
else if (r1->type == CAMEL_SEXP_RES_TIME)
|
|
- g_string_append_printf(str, "%ld", r1->value.time);
|
|
+ g_string_append_printf(str, "%d", r1->value.time);
|
|
else if (r1->type == CAMEL_SEXP_RES_STRING)
|
|
g_string_append_printf(str, "%s", r1->value.string);
|
|
|
|
@@ -296,7 +296,7 @@ eval_gt (struct _CamelSExp *f,
|
|
if (r2->type == CAMEL_SEXP_RES_BOOL)
|
|
g_string_append_printf(str, "%d", r2->value.boolean);
|
|
else if (r2->type == CAMEL_SEXP_RES_TIME)
|
|
- g_string_append_printf(str, "%ld", r2->value.time);
|
|
+ g_string_append_printf(str, "%d", r2->value.time);
|
|
else if (r2->type == CAMEL_SEXP_RES_STRING)
|
|
g_string_append_printf(str, "%s", r2->value.string);
|
|
camel_sexp_result_free (f, r1);
|