From 53443fbd01a2a6f90b8ff7a32fceba018ee7d15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 1 Jun 2010 15:23:16 +0200
Subject: [PATCH] SWZ: modification for Octave, whose 'mexPrintf' has 'void'
return type
---
.../utilities/DWCcode/arrays/dw_array.c | 25 +++++++++++++++----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c b/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
index 4f1156270..40ca9c348 100644
--- a/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
+++ b/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
@@ -159,7 +159,10 @@ int dw_PrintArray(FILE *f, void *a, char *format)
static int dw_PrintInt(FILE* f, void* element, char *format)
{
if(f==stdout)
- return (swz_fprintf_stdout(format ? format : "%d ",*((int*)element)) < 0) ? 0 : 1;
+ {
+ swz_fprintf_stdout(format ? format : "%d ",*((int*)element));
+ return 1;
+ }
else
return (fprintf(f,format ? format : "%d ",*((int*)element)) < 0) ? 0 : 1;
}
@@ -167,7 +170,10 @@ static int dw_PrintInt(FILE* f, void* element, char *format)
static int dw_PrintDouble(FILE* f, void* element, char *format)
{
if(f==stdout)
- return (swz_fprintf_stdout(format ? format : "%lf ",*((double*)element)) < 0) ? 0 : 1;
+ {
+ swz_fprintf_stdout(format ? format : "%lf ",*((double*)element));
+ return 1;
+ }
else
return (fprintf(f,format ? format : "%lf ",*((double*)element)) < 0) ? 0 : 1;
}
@@ -175,7 +181,10 @@ static int dw_PrintDouble(FILE* f, void* element, char *format)
static int dw_PrintFloat(FILE* f, void* element, char *format)
{
if(f==stdout)
- return (swz_fprintf_stdout(format ? format : "%f ",*((float*)element)) < 0) ? 0 : 1;
+ {
+ swz_fprintf_stdout(format ? format : "%f ",*((float*)element));
+ return 1;
+ }
else
return (fprintf(f,format ? format : "%f ",*((float*)element)) < 0) ? 0 : 1;
}
@@ -183,7 +192,10 @@ static int dw_PrintFloat(FILE* f, void* element, char *format)
static int dw_PrintChar(FILE* f, void* element, char *format)
{
if(f==stdout)
- return (swz_fprintf_stdout(format ? format : "%c ",*((char*)element)) < 0) ? 0 : 1;
+ {
+ swz_fprintf_stdout(format ? format : "%c ",*((char*)element));
+ return 1;
+ }
else
return (fprintf(f,format ? format : "%c ",*((char*)element)) < 0) ? 0 : 1;
}
@@ -191,7 +203,10 @@ static int dw_PrintChar(FILE* f, void* element, char *format)
static int dw_PrintString(FILE* f, void* element, char *format)
{
if(f==stdout)
- return (swz_fprintf_stdout(format ? format : "%s\t",(char*)element) < 0) ? 0 : 1;
+ {
+ swz_fprintf_stdout(format ? format : "%s\t",(char*)element);
+ return 1;
+ }
else
return (fprintf(f,format ? format : "%s\t",(char*)element) < 0) ? 0 : 1;
}
--
GitLab