diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2015-10-17 16:41:29 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2015-10-17 16:41:29 +0000 |
| commit | bc3fc9f856c62745f61d788e0f1e83cae8f57cb7 (patch) | |
| tree | d7c5175670c745dbbcf891e2f48c64b9033bfc9c /mail/openemm2013/files/patch-src__c__xmlback__eval.c | |
| parent | net/ostinato: 0.5.1 -> 0.7.1 (diff) | |
New port: mail/openemm2013
OpenEMM is a feature-rich web-based enterprise application for email
marketing, newsletters and service mails (transaction mails and
event or time triggered mails). OpenEMM offers a great user interface,
sophisticated bounce management, link tracking, lots of graphical
realtime statistics, a CMS module and a scripting feature to implement
individual tasks.
OpenEMM is the first open source application for e-mail marketing.
Its code base has been developed since 1999 and is used - as part
of the commercial software product E-Marketing Manager (EMM) - by
companies like IBM, Daimler, Siemens and Deutsche Telekom.
OpenEMM offers already more than 95% of the functionality of most
commercial products and some features most commercial products do
not offer right now (for example MySQL support and CMS functionality).
WWW: http://www.openemm.org
PR: 196516
Submitted by: Horst Leitenmueller <horst.leitenmueller@liwest.at>
Diffstat (limited to 'mail/openemm2013/files/patch-src__c__xmlback__eval.c')
| -rw-r--r-- | mail/openemm2013/files/patch-src__c__xmlback__eval.c | 145 |
1 files changed, 145 insertions, 0 deletions
diff --git a/mail/openemm2013/files/patch-src__c__xmlback__eval.c b/mail/openemm2013/files/patch-src__c__xmlback__eval.c new file mode 100644 index 000000000000..5fe238706e8f --- /dev/null +++ b/mail/openemm2013/files/patch-src__c__xmlback__eval.c @@ -0,0 +1,145 @@ +--- src/c/xmlback/eval.c.orig 2015-10-11 16:41:54 UTC ++++ src/c/xmlback/eval.c +@@ -198,9 +198,10 @@ ctx_clr (void) /*{{{*/ + static inline void + check_error (void) /*{{{*/ + { +- if (SLang_Error) { ++ if (SLang_get_error()) { + SLang_restart (1); +- SLang_Error = 0; ++ /*SLang_Error = 0;*/ ++ SLang_set_error(0); + } + }/*}}}*/ + static void +@@ -243,7 +244,8 @@ type_retreive (int argc) /*{{{*/ + int dummy; + + if (! (argv = (type_t *) malloc (argc * sizeof (type_t)))) { +- SLang_Error = SL_MALLOC_ERROR; ++ /*SLang_Error = SL_MALLOC_ERROR;*/ ++ SLang_set_error(SL_MALLOC_ERROR); + return NULL; + } + for (n = 0; n < argc; ++n) +@@ -262,7 +264,7 @@ type_retreive (int argc) /*{{{*/ + argv[n].v.n = (double) dummy; + break; + case SLANG_DOUBLE_TYPE: +- if (SLang_pop_double (& argv[n].v.n, & dummy, & dummy) == -1) ++ if (SLang_pop_double (& argv[n].v.n) == -1) + st = false; + break; + case SLANG_STRING_TYPE: +@@ -901,7 +903,8 @@ SLin (void) /*{{{*/ + + argc = SLang_Num_Function_Args; + if (argc < 2) { +- SLang_Error = SL_SYNTAX_ERROR; ++ /*SLang_Error = SL_SYNTAX_ERROR;*/ ++ SLang_set_error(SL_SYNTAX_ERROR); + return -1; + } + rc = 0; +@@ -928,7 +931,8 @@ SLin (void) /*{{{*/ + } + free (i); + } else { +- SLang_Error = SL_MALLOC_ERROR; ++ /*SLang_Error = SL_MALLOC_ERROR;*/ ++ SLang_set_error(SL_MALLOC_ERROR); + rc = -1; + } + } +@@ -940,7 +944,7 @@ SLin (void) /*{{{*/ + + if (d = (double *) malloc (argc * sizeof (double))) { + for (n = 0; n < argc; ++n) +- if (SLang_pop_double (& d[n], & dummy, & dummy) == -1) { ++ if (SLang_pop_double (& d[n]) == -1) { + rc = -1; + break; + } +@@ -952,7 +956,8 @@ SLin (void) /*{{{*/ + } + free (d); + } else { +- SLang_Error = SL_MALLOC_ERROR; ++ /*SLang_Error = SL_MALLOC_ERROR;*/ ++ SLang_set_error(SL_MALLOC_ERROR); + rc = -1; + } + } +@@ -980,14 +985,16 @@ SLin (void) /*{{{*/ + } + free (s); + } else { +- SLang_Error = SL_MALLOC_ERROR; ++ /*SLang_Error = SL_MALLOC_ERROR;*/ ++ SLang_set_error(SL_MALLOC_ERROR); + rc = -1; + } + } + break; + } +- if ((rc == -1) && (! SLang_Error)) +- SLang_Error = SL_TYPE_MISMATCH; ++ if ((rc == -1) && (! SLang_get_error())) ++ /*SLang_Error = SL_TYPE_MISMATCH;*/ ++ SLang_set_error(SL_TYPE_MISMATCH); + return rc; + }/*}}}*/ + static int +@@ -1000,7 +1007,8 @@ SLbetween (void) /*{{{*/ + + argc = SLang_Num_Function_Args; + if (argc != 3) { +- SLang_Error = SL_SYNTAX_ERROR; ++ /*SLang_Error = SL_SYNTAX_ERROR;*/ ++ SLang_set_error(SL_SYNTAX_ERROR); + return -1; + } + if (! (argv = type_retreive (argc))) +@@ -1030,8 +1038,9 @@ SLbetween (void) /*{{{*/ + break; + } + type_release (argc, argv); +- if ((rc == -1) && (! SLang_Error)) +- SLang_Error = SL_TYPE_MISMATCH; ++ if ((rc == -1) && (! SLang_get_error())) ++ /*SLang_Error = SL_TYPE_MISMATCH;*/ ++ SLang_set_error(SL_TYPE_MISMATCH); + return rc; + }/*}}}*/ + static void +@@ -1044,7 +1053,8 @@ SLdecode (void) /*{{{*/ + + argc = SLang_Num_Function_Args; + if ((argc < 4) || (argc % 2 != 0)) { +- SLang_Error = SL_SYNTAX_ERROR; ++ /*SLang_Error = SL_SYNTAX_ERROR;*/ ++ SLang_set_error(SL_SYNTAX_ERROR); + return; + } + if (! (argv = type_retreive (argc))) +@@ -1068,7 +1078,8 @@ SLdecode (void) /*{{{*/ + if (argv[argc - 1].type != argv[2].type) + st = false; + if (! st) +- SLang_Error = SL_TYPE_MISMATCH; ++ /*SLang_Error = SL_TYPE_MISMATCH;*/ ++ SLang_set_error(SL_TYPE_MISMATCH); + else { + int hit = -1; + +@@ -1092,7 +1103,8 @@ SLdecode (void) /*{{{*/ + switch (argv[hit].type) { + default: + st = false; +- SLang_Error = SL_TYPE_MISMATCH; ++ /*SLang_Error = SL_TYPE_MISMATCH;*/ ++ SLang_set_error(SL_TYPE_MISMATCH); + break; + case SLANG_INT_TYPE: + SLang_push_integer ((int) argv[hit].v.n); |
