Revert "Scicos blocks: remove sciprint dependency" 26/13926/2
Vincent COUVERT [Thu, 6 Mar 2014 10:26:34 +0000 (11:26 +0100)]
This reverts commit 8ef56558f5d588dbeda3fd7744d9227d1505d950.

Change-Id: I836c22cc3644d83880cbd913927c3963587119ff

45 files changed:
scilab/modules/javasci/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/includes/scicos_print.h [deleted file]
scilab/modules/scicos/src/c/Output_stream_Import.def
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos/src/c/scicos_print.c [deleted file]
scilab/modules/scicos_blocks/src/c/Output_stream_Import.def
scilab/modules/scicos_blocks/src/c/Scicos_Import.def
scilab/modules/scicos_blocks/src/c/absblk.c
scilab/modules/scicos_blocks/src/c/automat.c
scilab/modules/scicos_blocks/src/c/convert.c
scilab/modules/scicos_blocks/src/c/edgetrig.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/gainblk_i16e.c
scilab/modules/scicos_blocks/src/c/gainblk_i32e.c
scilab/modules/scicos_blocks/src/c/gainblk_i8e.c
scilab/modules/scicos_blocks/src/c/gainblk_ui16e.c
scilab/modules/scicos_blocks/src/c/gainblk_ui32e.c
scilab/modules/scicos_blocks/src/c/gainblk_ui8e.c
scilab/modules/scicos_blocks/src/c/matbyscal_e.c
scilab/modules/scicos_blocks/src/c/matmul2_e.c
scilab/modules/scicos_blocks/src/c/matmul_i16e.c
scilab/modules/scicos_blocks/src/c/matmul_i32e.c
scilab/modules/scicos_blocks/src/c/matmul_i8e.c
scilab/modules/scicos_blocks/src/c/matmul_ui16e.c
scilab/modules/scicos_blocks/src/c/matmul_ui32e.c
scilab/modules/scicos_blocks/src/c/matmul_ui8e.c
scilab/modules/scicos_blocks/src/c/readau.c
scilab/modules/scicos_blocks/src/c/readc.c
scilab/modules/scicos_blocks/src/c/scicos-cli_Import.def
scilab/modules/scicos_blocks/src/c/summation_i16e.c
scilab/modules/scicos_blocks/src/c/summation_i32e.c
scilab/modules/scicos_blocks/src/c/summation_i8e.c
scilab/modules/scicos_blocks/src/c/summation_ui16e.c
scilab/modules/scicos_blocks/src/c/summation_ui32e.c
scilab/modules/scicos_blocks/src/c/summation_ui8e.c
scilab/modules/scicos_blocks/src/c/time_delay.c
scilab/modules/scicos_blocks/src/c/tows_c.c
scilab/modules/scicos_blocks/src/c/variable_delay.c
scilab/modules/scicos_blocks/src/c/writeau.c
scilab/modules/scicos_blocks/src/c/writec.c

index 116b47f..7e7addd 100644 (file)
@@ -972,8 +972,8 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
 clean: clean-am
 
index 93fde27..5034c6f 100644 (file)
@@ -15,7 +15,6 @@ DISABLE_HELP_CLEAN=yes
 
 SCICOS_C_SOURCES = src/c/tree.c \
 src/c/scicos_malloc.c \
-src/c/scicos_print.c \
 src/c/import.c \
 src/c/scicos.c \
 src/c/scicos_free.c \
@@ -180,7 +179,6 @@ includes/scicos-def.h \
 includes/scicos_free.h \
 includes/scicos_malloc.h \
 includes/scicos_math.h \
-includes/scicos_print.h \
 includes/dynlib_scicos.h \
 includes/import.h
 
index ebf4ad8..c02603f 100644 (file)
@@ -200,10 +200,10 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciscicos_algo_la_LIBADD =
 am__libsciscicos_algo_la_SOURCES_DIST = src/c/noscicos/noscicos.c \
-       src/c/tree.c src/c/scicos_malloc.c src/c/scicos_print.c \
-       src/c/import.c src/c/scicos.c src/c/scicos_free.c \
-       src/c/sciblk2.c src/c/sciblk4.c src/c/ezxml.c src/c/il_state.c \
-       src/c/il_sim.c src/c/createblklist.c src/c/var2sci.c \
+       src/c/tree.c src/c/scicos_malloc.c src/c/import.c \
+       src/c/scicos.c src/c/scicos_free.c src/c/sciblk2.c \
+       src/c/sciblk4.c src/c/ezxml.c src/c/il_state.c src/c/il_sim.c \
+       src/c/createblklist.c src/c/var2sci.c \
        src/c/copyvarfromlistentry.c src/c/MlistGetFieldNumber.c \
        src/c/extractblklist.c src/c/lsodar.c src/c/ddaskr.c \
        src/fortran/scitovv.f src/fortran/vvtosci.f \
@@ -216,7 +216,6 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = src/c/noscicos/libsciscicos_algo_la-noscicos.lo
 am__objects_2 = src/c/libsciscicos_algo_la-tree.lo \
        src/c/libsciscicos_algo_la-scicos_malloc.lo \
-       src/c/libsciscicos_algo_la-scicos_print.lo \
        src/c/libsciscicos_algo_la-import.lo \
        src/c/libsciscicos_algo_la-scicos.lo \
        src/c/libsciscicos_algo_la-scicos_free.lo \
@@ -852,7 +851,6 @@ DISABLE_HELP_CLEAN = yes
 #### Source listing ######
 SCICOS_C_SOURCES = src/c/tree.c \
 src/c/scicos_malloc.c \
-src/c/scicos_print.c \
 src/c/import.c \
 src/c/scicos.c \
 src/c/scicos_free.c \
@@ -992,7 +990,6 @@ includes/scicos-def.h \
 includes/scicos_free.h \
 includes/scicos_malloc.h \
 includes/scicos_math.h \
-includes/scicos_print.h \
 includes/dynlib_scicos.h \
 includes/import.h
 
@@ -1328,8 +1325,6 @@ src/c/libsciscicos_algo_la-tree.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libsciscicos_algo_la-scicos_malloc.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
-src/c/libsciscicos_algo_la-scicos_print.lo: src/c/$(am__dirstamp) \
-       src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libsciscicos_algo_la-import.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libsciscicos_algo_la-scicos.lo: src/c/$(am__dirstamp) \
@@ -1912,7 +1907,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_free.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_malloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_print.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-tree.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-var2sci.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/noscicos/$(DEPDIR)/libsciscicos_algo_la-noscicos.Plo@am__quote@
@@ -1981,13 +1975,6 @@ src/c/libsciscicos_algo_la-scicos_malloc.lo: src/c/scicos_malloc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciscicos_algo_la-scicos_malloc.lo `test -f 'src/c/scicos_malloc.c' || echo '$(srcdir)/'`src/c/scicos_malloc.c
 
-src/c/libsciscicos_algo_la-scicos_print.lo: src/c/scicos_print.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libsciscicos_algo_la-scicos_print.lo -MD -MP -MF src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_print.Tpo -c -o src/c/libsciscicos_algo_la-scicos_print.lo `test -f 'src/c/scicos_print.c' || echo '$(srcdir)/'`src/c/scicos_print.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_print.Tpo src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_print.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/scicos_print.c' object='src/c/libsciscicos_algo_la-scicos_print.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciscicos_algo_la-scicos_print.lo `test -f 'src/c/scicos_print.c' || echo '$(srcdir)/'`src/c/scicos_print.c
-
 src/c/libsciscicos_algo_la-import.lo: src/c/import.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libsciscicos_algo_la-import.lo -MD -MP -MF src/c/$(DEPDIR)/libsciscicos_algo_la-import.Tpo -c -o src/c/libsciscicos_algo_la-import.lo `test -f 'src/c/import.c' || echo '$(srcdir)/'`src/c/import.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libsciscicos_algo_la-import.Tpo src/c/$(DEPDIR)/libsciscicos_algo_la-import.Plo
diff --git a/scilab/modules/scicos/includes/scicos_print.h b/scilab/modules/scicos/includes/scicos_print.h
deleted file mode 100644 (file)
index 01625a7..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*  Scicos
-*
-*  Copyright (C) Scilab Enterprises
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* See the file ./license.txt
-*/
-
-#ifndef __SCICOS_PRINT_H__
-#define __SCICOS_PRINT_H__
-
-void scicos_print(const char* fmt, ...);
-
-#endif /*__SCICOS_PRINT_H__*/
index 087c701..96c2feb 100644 (file)
@@ -303,7 +303,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\scicos.c" />
     <ClCompile Include="..\scicos_free.c" />
     <ClCompile Include="..\scicos_malloc.c" />
-    <ClCompile Include="..\scicos_print.c" />
     <ClCompile Include="..\tree.c" />
     <ClCompile Include="..\var2sci.c" />
   </ItemGroup>
@@ -325,7 +324,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClInclude Include="..\..\..\includes\scicos_free.h" />
     <ClInclude Include="..\..\..\includes\scicos_malloc.h" />
     <ClInclude Include="..\..\..\includes\scicos_math.h" />
-    <ClInclude Include="..\..\..\includes\scicos_print.h" />
     <ClInclude Include="..\sciblk2.h" />
     <ClInclude Include="..\sciblk4.h" />
     <ClInclude Include="..\tree.h" />
index 90531d2..6e8c238 100644 (file)
     <ClCompile Include="..\scicos_malloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\scicos_print.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\tree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="..\..\..\includes\scicos_math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\includes\scicos_print.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\tree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index c74abe6..1fd3a63 100644 (file)
@@ -303,7 +303,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="scicos.c" />
     <ClCompile Include="scicos_free.c" />
     <ClCompile Include="scicos_malloc.c" />
-    <ClCompile Include="scicos_print.c" />
     <ClCompile Include="tree.c" />
     <ClCompile Include="var2sci.c" />
   </ItemGroup>
@@ -325,7 +324,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClInclude Include="..\..\includes\scicos_free.h" />
     <ClInclude Include="..\..\includes\scicos_malloc.h" />
     <ClInclude Include="..\..\includes\scicos_math.h" />
-    <ClInclude Include="..\..\includes\scicos_print.h" />
     <ClInclude Include="sciblk2.h" />
     <ClInclude Include="sciblk4.h" />
     <ClInclude Include="tree.h" />
index 40bb83d..588ccee 100644 (file)
     <ClCompile Include="scicos_malloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="scicos_print.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="tree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="..\..\includes\scicos_math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\scicos_print.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="tree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/scilab/modules/scicos/src/c/scicos_print.c b/scilab/modules/scicos/src/c/scicos_print.c
deleted file mode 100644 (file)
index a738cca..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Scicos
-*
-*  Copyright (C) Scilab Enterprises
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* See the file ./license.txt
-*/
-
-#include "sciprint.h"
-
-void scicos_print(const char* fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    scivprint(fmt, ap);
-    va_end (ap);
-}
-
index d9ef5cf..9f3c3fe 100644 (file)
@@ -3,5 +3,6 @@ LIBRARY    output_stream.dll
 
 EXPORTS
 ;
-; output_stream  
-basout_
+; output_stream
+sciprint  
+basout_
\ No newline at end of file
index f6bca26..c74725b 100644 (file)
@@ -5,7 +5,6 @@ EXPORTS
 ;
 scicos_malloc
 scicos_free
-scicos_print
 get_phase_simulation
 set_block_error
 get_scicos_time
@@ -16,4 +15,4 @@ getlabel_
 getouttb_
 scsptr_
 end_scicos_sim
-Coserror
+Coserror
\ No newline at end of file
index 43fa3ac..4607c5b 100644 (file)
@@ -24,6 +24,7 @@
 #include "core_math.h"
 #include "dynlib_scicos_blocks.h"
 #include "scicos.h"
+#include "elementary_functions.h" /* C2F(dmmul) */
 /*--------------------------------------------------------------------------*/
 /*------------------------------------------------
  *     Scicos block simulator
index e691e43..1b3f8c4 100644 (file)
@@ -182,7 +182,7 @@ SCICOS_BLOCKS_IMPEXP void automat(scicos_block *block, int flag)
                 {
                     break;
                 }
-            /*      scicos_print(_("\n Warning!: In Mode=%d, the jump condition #%d has crossed zero in negative dierction"),Mi,k+1); */
+            /*      sciprint(_("\n Warning!: In Mode=%d, the jump condition #%d has crossed zero in negative dierction"),Mi,k+1); */
         }
         ui = GetRealInPortPtrs(block, Mf);
         for (i = 0; i < NX; i++)
index 1992b03..96f22e3 100644 (file)
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include "scicos.h"
 #include "scicos_block4.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "MALLOC.h"
 #include "dynlib_scicos_blocks.h"
@@ -1211,7 +1211,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1236,7 +1236,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1261,7 +1261,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1286,7 +1286,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1311,7 +1311,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1336,7 +1336,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1361,7 +1361,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1386,7 +1386,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1410,7 +1410,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1435,7 +1435,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1460,7 +1460,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1485,7 +1485,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1509,7 +1509,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1533,7 +1533,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1558,7 +1558,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1582,7 +1582,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1606,7 +1606,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1630,7 +1630,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1655,7 +1655,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1680,7 +1680,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1705,7 +1705,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1730,7 +1730,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1755,7 +1755,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1780,7 +1780,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1805,7 +1805,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1830,7 +1830,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
@@ -1855,7 +1855,7 @@ SCICOS_BLOCKS_IMPEXP void convert(scicos_block *block, int flag)
                     {
                         if (flag == 1)
                         {
-                            scicos_print(_("overflow error"));
+                            sciprint(_("overflow error"));
                             set_block_error(-4);
                             return;
                         }
index c24a619..e5b0e47 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include "scicos_block.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "dynlib_scicos_blocks.h"
 /*--------------------------------------------------------------------------*/
@@ -38,7 +38,7 @@ SCICOS_BLOCKS_IMPEXP void edgetrig(scicos_block *block, int flag)
         {
             z = z * block->ipar[0];
             u = u * block->ipar[0];
-            if (((z <= 0) & (u > 0)) || ((z < 0) & (u >= 0)))
+            if (((z <= 0) & (u>0)) || ((z<0) & (u >= 0)))
             {
                 block->outptr[0][0] = 1.;
             }
@@ -49,7 +49,7 @@ SCICOS_BLOCKS_IMPEXP void edgetrig(scicos_block *block, int flag)
         }
         else    /* rising and falling edge */
         {
-            if (((z <= 0) & (u > 0)) || ((z < 0) & (u >= 0)) || ((z > 0) & (u <= 0)) || ((z >= 0) & (u < 0)))
+            if (((z <= 0) & (u>0)) || ((z<0) & (u >= 0)) || ((z > 0) & (u <= 0)) || ((z >= 0) & (u < 0)))
             {
                 block->outptr[0][0] = 1.;
             }
@@ -64,7 +64,7 @@ SCICOS_BLOCKS_IMPEXP void edgetrig(scicos_block *block, int flag)
         if (block->ng > 0)
         {
             set_block_error(-1);
-            scicos_print(_("Trigger block must have discrete time input."));
+            sciprint(_("Trigger block must have discrete time input."));
             return;
         }
     }
index d58ab08..3d4cde5 100644 (file)
@@ -25,7 +25,7 @@
 #include <math.h>
 #include "stack-c.h"
 #include "scicos.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "cvstr.h"
 #include "MALLOC.h"
 #include "mopen.h"
@@ -179,7 +179,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
             if (!Ishm(&fd, &Ytype, &nPoints, &mY, &nY, &YsubType))
             {
                 Coserror(_("Invalid variable type.\n"));
-                /*scicos_print(_("Invalid variable type.\n"));
+                /*sciprint(_("Invalid variable type.\n"));
                 set_block_error(-3); */
                 C2F(mclose)(&fd, &res);
                 return;
@@ -187,7 +187,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
             if (!((Ytype == 1) || (Ytype == 8)))
             {
                 Coserror(_("Invalid variable type.\n"));
-                /*scicos_print(_("Invalid variable type.\n"));
+                /*sciprint(_("Invalid variable type.\n"));
                 set_block_error(-3);*/
                 C2F(mclose)(&fd, &res);
                 return;
@@ -205,7 +205,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
         else
         {
             Coserror(_("Invalid variable type.\n"));
-            /*scicos_print(_("Invalid variable type.\n"));
+            /*sciprint(_("Invalid variable type.\n"));
             set_block_error(-3);*/
             C2F(mclose)(&fd, &res);
             return;
@@ -255,7 +255,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                 case 1:
                     if (ytype != 81)
                     {
-                        scicos_print(_("Output should be of int8 type.\n"));
+                        sciprint(_("Output should be of int8 type.\n"));
                         set_block_error(-3);
                         C2F(mclose)(&fd, &res);
                         return;
@@ -465,7 +465,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
 
         if ((Ydim[6] != 1) | (Ydim[9] != 0))
         {
-            scicos_print(_("The Time vector type is not ""double"".\n"));
+            sciprint(_("The Time vector type is not ""double"".\n"));
             set_block_error(-3);
             *work = NULL;
             scicos_free(ptr->work);
index 749e7fb..953e112 100644 (file)
@@ -20,7 +20,7 @@
 */
 /*--------------------------------------------------------------------------*/
 #include <math.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -45,14 +45,14 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i16e(scicos_block *block, int flag)
         y = Getint16OutPortPtrs(block, 1);
         opar = Getint16OparPtrs(block, 1);
         k = pow(2, 16) / 2;
-        if (mo * no == 1)
+        if (mo*no == 1)
         {
             for (i = 0; i < ny * mu; ++i)
             {
                 D = (double)(opar[0]) * (double)(u[i]);
                 if ((D >= k) | ( D < -k))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
@@ -80,7 +80,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i16e(scicos_block *block, int flag)
                     }
                     if ((D >= k) | ( D < -k))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index faee54a..d290754 100644 (file)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include "scicos.h"
 #include "scicos_block4.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "MALLOC.h"
 #include "dynlib_scicos_blocks.h"
@@ -47,14 +47,14 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32e(scicos_block *block, int flag)
         opar = Getint32OparPtrs(block, 1);
 
         k = pow(2, 32) / 2;
-        if (mo * no == 1)
+        if (mo*no == 1)
         {
             for (i = 0; i < ny * mu; ++i)
             {
                 D = (double)(opar[0]) * (double)(u[i]);
                 if ((D >= k) | ( D < -k))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
@@ -82,7 +82,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32e(scicos_block *block, int flag)
                     }
                     if ((D >= k) | ( D < -k))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index df3451e..26e6ddf 100644 (file)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include "scicos.h"
 #include "scicos_block4.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "MALLOC.h"
 #include "dynlib_scicos_blocks.h"
@@ -47,14 +47,14 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i8e(scicos_block *block, int flag)
         opar = Getint8OparPtrs(block, 1);
 
         k = pow(2, 8) / 2;
-        if (mo * no == 1)
+        if (mo*no == 1)
         {
             for (i = 0; i < ny * mu; ++i)
             {
                 D = (double)(opar[0]) * (double)(u[i]);
                 if ((D >= k) | ( D < -k))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
@@ -82,7 +82,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i8e(scicos_block *block, int flag)
                     }
                     if ((D >= k) | ( D < -k))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index 69230b0..705cd6b 100644 (file)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include "scicos.h"
 #include "scicos_block4.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "MALLOC.h"
 #include "dynlib_scicos_blocks.h"
@@ -47,14 +47,14 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui16e(scicos_block *block, int flag)
         opar = Getuint16OparPtrs(block, 1);
 
         k = pow(2, 16);
-        if (mo * no == 1)
+        if (mo*no == 1)
         {
             for (i = 0; i < ny * mu; ++i)
             {
                 D = (double)(opar[0]) * (double)(u[i]);
                 if ((D >= k) | ( D < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
@@ -82,7 +82,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui16e(scicos_block *block, int flag)
                     }
                     if ((D >= k) | ( D < 0))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index be4ccd1..4a249f3 100644 (file)
@@ -20,7 +20,7 @@
 */
 /*--------------------------------------------------------------------------*/
 #include <math.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -47,14 +47,14 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32e(scicos_block *block, int flag)
         opar = Getuint32OparPtrs(block, 1);
 
         k = pow(2, 32);
-        if (mo * no == 1)
+        if (mo*no == 1)
         {
             for (i = 0; i < ny * mu; ++i)
             {
                 D = (double)(opar[0]) * (double)(u[i]);
                 if ((D >= k) | ( D < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
@@ -82,7 +82,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32e(scicos_block *block, int flag)
                     }
                     if ((D >= k) | ( D < 0))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index 57a4387..0adb2e4 100644 (file)
@@ -20,7 +20,7 @@
 */
 /*--------------------------------------------------------------------------*/
 #include <math.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -47,14 +47,14 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui8e(scicos_block *block, int flag)
         opar = Getuint8OparPtrs(block, 1);
 
         k = pow(2, 8);
-        if (mo * no == 1)
+        if (mo*no == 1)
         {
             for (i = 0; i < ny * mu; ++i)
             {
                 D = (double)(opar[0]) * (double)(u[i]);
                 if ((D >= k) | ( D < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
@@ -82,7 +82,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui8e(scicos_block *block, int flag)
                     }
                     if ((D >= k) | ( D < 0))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index 1dec035..0e778cf 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -51,7 +51,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[0];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -74,7 +74,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[0];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -97,7 +97,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[0];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -120,7 +120,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[0];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -143,7 +143,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[0];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -166,7 +166,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[0];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index cf475b2..e7d7a8f 100644 (file)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "scicos.h"
 #include "scicos_block4.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "dynlib_scicos_blocks.h"
 /*--------------------------------------------------------------------------*/
@@ -51,7 +51,7 @@ SCICOS_BLOCKS_IMPEXP void matmul2_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[i];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -74,7 +74,7 @@ SCICOS_BLOCKS_IMPEXP void matmul2_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[i];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -97,7 +97,7 @@ SCICOS_BLOCKS_IMPEXP void matmul2_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[i];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -120,7 +120,7 @@ SCICOS_BLOCKS_IMPEXP void matmul2_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[i];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -143,7 +143,7 @@ SCICOS_BLOCKS_IMPEXP void matmul2_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[i];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
@@ -166,7 +166,7 @@ SCICOS_BLOCKS_IMPEXP void matmul2_e(scicos_block *block, int flag)
                     v = (double)u1[i] * (double)u2[i];
                     if ((v < rpar[0]) | (v > rpar[1]))
                     {
-                        scicos_print(_("overflow error"));
+                        sciprint(_("overflow error"));
                         set_block_error(-4);
                         return;
                     }
index 57a0755..c2f9142 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -58,7 +58,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_i16e(scicos_block *block, int flag)
 
                 if ((D > ((k / 2) - 1)) | (D < -((k / 2))))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 540c001..8129fa9 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -59,7 +59,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32e(scicos_block *block, int flag)
 
                 if ((D > ((k / 2) - 1)) | (D < -((k / 2))))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index df14779..593c66a 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -59,7 +59,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_i8e(scicos_block *block, int flag)
                 }
                 if ((D > ((k / 2) - 1)) | (D < -((k / 2))))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index cb625dc..d2e1785 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -59,7 +59,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui16e(scicos_block *block, int flag)
                 }
                 if ((D > (k - 1)) | (D < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 244dcb4..51f7491 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -59,7 +59,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32e(scicos_block *block, int flag)
                 }
                 if ((D > (k - 1)) | (D < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 7ff1f7a..244b711 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -57,7 +57,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui8e(scicos_block *block, int flag)
                 }
                 if ((D > (k - 1)) | (D < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 7b1fa47..df7d76a 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "machine.h"
 #include "charEncoding.h"
 #include "cvstr.h"
@@ -144,7 +144,7 @@ ipar[10:9+lfil] = character codes for file name
                 mget2(fd, ipar[8], buffer, m, type, &ierr);
                 if (ierr > 0)
                 {
-                    scicos_print(_("Read error!\n"));
+                    sciprint(_("Read error!\n"));
                     fclose(fd);
                     z[3] = 0.0;
                     *flag = -1;
@@ -176,7 +176,7 @@ ipar[10:9+lfil] = character codes for file name
         wcfopen(fd, str, "rb");
         if (!fd )
         {
-            scicos_print(_("Could not open the file!\n"));
+            sciprint(_("Could not open the file!\n"));
             *flag = -1;
             return;
         }
@@ -195,7 +195,7 @@ ipar[10:9+lfil] = character codes for file name
             irep = fseek(fd, offset, 0) ;
             if ( irep != 0 )
             {
-                scicos_print(_("Read error\n"));
+                sciprint(_("Read error\n"));
                 *flag = -1;
                 fclose(fd);
                 z[3] = 0.0;
@@ -214,7 +214,7 @@ ipar[10:9+lfil] = character codes for file name
         mget2(fd, ipar[8], buffer, m, type, &ierr);
         if (ierr > 0)
         {
-            scicos_print(_("Read error!\n"));
+            sciprint(_("Read error!\n"));
             *flag = -1;
             fclose(fd);
             z[3] = 0.0;
index 6516d10..76c96a3 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <stdio.h>
 #include <string.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "machine.h"
 #include "charEncoding.h"
 #include "cvstr.h"
@@ -105,7 +105,7 @@ ipar[10+lfil:9+lfil++ny+ievt] = reading mask
                 mget2(fd, ipar[8], buffer, m, type, &ierr);
                 if (ierr > 0)
                 {
-                    scicos_print(_("Read error!\n"));
+                    sciprint(_("Read error!\n"));
                     fclose(fd);
                     z[3] = 0.0;
                     *flag = -1;
@@ -163,7 +163,7 @@ ipar[10+lfil:9+lfil++ny+ievt] = reading mask
         wcfopen(fd, str, "rb");
         if (!fd )
         {
-            scicos_print(_("Could not open the file!\n"));
+            sciprint(_("Could not open the file!\n"));
             *flag = -1;
             return;
         }
@@ -182,7 +182,7 @@ ipar[10+lfil:9+lfil++ny+ievt] = reading mask
             irep = fseek(fd, offset, 0) ;
             if ( irep != 0 )
             {
-                scicos_print(_("Read error\n"));
+                sciprint(_("Read error\n"));
                 *flag = -1;
                 fclose(fd);
                 z[3] = 0.0;
@@ -201,7 +201,7 @@ ipar[10+lfil:9+lfil++ny+ievt] = reading mask
         mget2(fd, ipar[8], buffer, m, type, &ierr);
         if (ierr > 0)
         {
-            scicos_print(_("Read error!\n"));
+            sciprint(_("Read error!\n"));
             *flag = -1;
             fclose(fd);
             z[3] = 0.0;
index cc60bbc..f4266ab 100644 (file)
@@ -5,7 +5,6 @@ EXPORTS
 ;
 scicos_malloc
 scicos_free
-scicos_print
 get_phase_simulation
 set_block_error
 get_scicos_time
@@ -16,4 +15,4 @@ getlabel_
 getouttb_
 scsptr_
 end_scicos_sim
-Coserror
+Coserror
\ No newline at end of file
index 5e1607f..5c0960e 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -51,7 +51,7 @@ SCICOS_BLOCKS_IMPEXP void summation_i16e(scicos_block *block, int flag)
             }
             if ((v >= l) | (v < -l))
             {
-                scicos_print(_("overflow error"));
+                sciprint(_("overflow error"));
                 set_block_error(-4);
                 return;
             }
@@ -79,7 +79,7 @@ SCICOS_BLOCKS_IMPEXP void summation_i16e(scicos_block *block, int flag)
                 }
                 if ((v >= l) | (v < -l))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 7e4db70..6bb726f 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -56,7 +56,7 @@ SCICOS_BLOCKS_IMPEXP void summation_i32e(scicos_block *block, int flag)
             }
             if ((v >= l) | (v < -l))
             {
-                scicos_print(_("overflow error"));
+                sciprint(_("overflow error"));
                 set_block_error(-4);
                 return;
             }
@@ -84,7 +84,7 @@ SCICOS_BLOCKS_IMPEXP void summation_i32e(scicos_block *block, int flag)
                 }
                 if ((v >= l) | (v < -l))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 23212cf..f376bc2 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -55,7 +55,7 @@ SCICOS_BLOCKS_IMPEXP void summation_i8e(scicos_block *block, int flag)
             }
             if ((v >= l) | (v < -l))
             {
-                scicos_print(_("overflow error"));
+                sciprint(_("overflow error"));
                 set_block_error(-4);
                 return;
             }
@@ -83,7 +83,7 @@ SCICOS_BLOCKS_IMPEXP void summation_i8e(scicos_block *block, int flag)
                 }
                 if ((v >= l) | (v < -l))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 44a7f87..1398f67 100644 (file)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "scicos.h"
 #include "scicos_block4.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "localization.h"
 #include "MALLOC.h"
 #include "dynlib_scicos_blocks.h"
@@ -56,7 +56,7 @@ SCICOS_BLOCKS_IMPEXP void summation_ui16e(scicos_block *block, int flag)
             }
             if ((v >= l) | (v < 0))
             {
-                scicos_print(_("overflow error"));
+                sciprint(_("overflow error"));
                 set_block_error(-4);
                 return;
             }
@@ -84,7 +84,7 @@ SCICOS_BLOCKS_IMPEXP void summation_ui16e(scicos_block *block, int flag)
                 }
                 if ((v >= l) | (v < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index bbf7ea6..0c1b6be 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -56,7 +56,7 @@ SCICOS_BLOCKS_IMPEXP void summation_ui32e(scicos_block *block, int flag)
             }
             if ((v >= l) | (v < 0))
             {
-                scicos_print(_("overflow error"));
+                sciprint(_("overflow error"));
                 set_block_error(-4);
                 return;
             }
@@ -84,7 +84,7 @@ SCICOS_BLOCKS_IMPEXP void summation_ui32e(scicos_block *block, int flag)
                 }
                 if ((v >= l) | (v < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index c95a61f..e43f87f 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos.h"
 #include "scicos_block4.h"
 #include "localization.h"
@@ -56,7 +56,7 @@ SCICOS_BLOCKS_IMPEXP void summation_ui8e(scicos_block *block, int flag)
             }
             if ((v >= l) | (v < 0))
             {
-                scicos_print(_("overflow error"));
+                sciprint(_("overflow error"));
                 set_block_error(-4);
                 return;
             }
@@ -84,7 +84,7 @@ SCICOS_BLOCKS_IMPEXP void summation_ui8e(scicos_block *block, int flag)
                 }
                 if ((v >= l) | (v < 0))
                 {
-                    scicos_print(_("overflow error"));
+                    sciprint(_("overflow error"));
                     set_block_error(-4);
                     return;
                 }
index 398ce03..b8896b3 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <math.h>
 #include "MALLOC.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "scicos_block.h"
 #include "localization.h"
 #include "dynlib_scicos_blocks.h"
@@ -86,8 +86,8 @@ SCICOS_BLOCKS_IMPEXP void time_delay(scicos_block *block, int flag)
         td = t - block->rpar[0];
         if (td < pw[*iw])
         {
-            scicos_print(_("delayed time=%f but last stored time=%f \n"), td, pw[*iw]);
-            scicos_print(_("Consider increasing the length of buffer in delay block \n"));
+            sciprint(_("delayed time=%f but last stored time=%f \n"), td, pw[*iw]);
+            sciprint(_("Consider increasing the length of buffer in delay block \n"));
         }
 
         if (t > pw[(block->ipar[0] + *iw - 1) % block->ipar[0]])
@@ -97,7 +97,7 @@ SCICOS_BLOCKS_IMPEXP void time_delay(scicos_block *block, int flag)
                 pw[*iw + block->ipar[0]*j] = block->inptr[0][j - 1];
             }
             pw[*iw] = t;
-            /*scicos_print(_("**time is %f. I put %f, in %d \n"), t,block->inptr[0][0],*iw);*/
+            /*sciprint(_("**time is %f. I put %f, in %d \n"), t,block->inptr[0][0],*iw);*/
             *iw = (*iw + 1) % block->ipar[0];
 
         }
@@ -108,7 +108,7 @@ SCICOS_BLOCKS_IMPEXP void time_delay(scicos_block *block, int flag)
                 pw[(block->ipar[0] + *iw - 1) % block->ipar[0] + block->ipar[0]*j] = block->inptr[0][j - 1];
             }
             pw[(block->ipar[0] + *iw - 1) % block->ipar[0]] = t;
-            /*scicos_print("**time is %f. I put %f, in %d \n", t,block->inptr[0][0],*iw);*/
+            /*sciprint("**time is %f. I put %f, in %d \n", t,block->inptr[0][0],*iw);*/
 
         }
 
@@ -144,8 +144,8 @@ SCICOS_BLOCKS_IMPEXP void time_delay(scicos_block *block, int flag)
         i = (i + *iw) % block->ipar[0];
         j = (j + *iw) % block->ipar[0];
         del = pw[j] - pw[i];
-        /*    scicos_print(_("time is %f. interpolating %d and %d, i.e. %f, %f\n"), t,i,j,pw[i],pw[j]);
-        scicos_print(_("values are  %f   %f.\n"),pw[i+block->ipar[0]],pw[j+block->ipar[0]]);*/
+        /*    sciprint(_("time is %f. interpolating %d and %d, i.e. %f, %f\n"), t,i,j,pw[i],pw[j]);
+        sciprint(_("values are  %f   %f.\n"),pw[i+block->ipar[0]],pw[j+block->ipar[0]]);*/
         if (del != 0.0)
         {
             for (k = 1; k < block->insz[0] + 1; k++)
index a087f70..9fe357d 100644 (file)
@@ -28,7 +28,7 @@
 #include "code2str.h"
 #include "stack-c.h"
 #include "MALLOC.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "cvstr.h"
 #include "mopen.h"
 #include "mput.h"
@@ -1308,7 +1308,7 @@ SCICOS_BLOCKS_IMPEXP void tows_c(scicos_block *block, int flag)
                 varName = strcat(varName, "_val");
                 switch (ut)
                 {
-                    // By default, nCols = 1, so should the input be a matrix, scalar or vector, perform the same operations
+                        // By default, nCols = 1, so should the input be a matrix, scalar or vector, perform the same operations
                     case SCSREAL_N    :
                         ptr_d = (SCSREAL_COP *) ((ismat) ? &ptr_i[44] : &ptr_i[10]);
                         if ((MatDouble = (double *) scicos_malloc(nRows * nCols * nCols2 * sizeof(double))) == NULL)
index 9d4a9dd..20b78f4 100644 (file)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include "MALLOC.h"
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "core_math.h"
 #include "scicos_block.h"
 #include "localization.h"
@@ -76,8 +76,8 @@ SCICOS_BLOCKS_IMPEXP void variable_delay(scicos_block *block, int flag)
         td = t - del;
         if (td < pw[*iw])
         {
-            scicos_print(_("delayed time=%f but last stored time=%f\n"), td, pw[*iw]);
-            scicos_print(_("Consider increasing the length of buffer in variable delay block\n"));
+            sciprint(_("delayed time=%f but last stored time=%f\n"), td, pw[*iw]);
+            sciprint(_("Consider increasing the length of buffer in variable delay block\n"));
         }
         if (t > pw[(block->ipar[0] + *iw - 1) % block->ipar[0]])
         {
index dfda84a..466dfb2 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "charEncoding.h"
 #include "mput.h"
 #include "localization.h"
@@ -123,7 +123,7 @@ ipar[7:6+lfil] = character codes for file name
         wcfopen(fd, "/dev/audio", "wb");
         if (!fd )
         {
-            scicos_print(_("Could not open /dev/audio!\n"));
+            sciprint(_("Could not open /dev/audio!\n"));
             *flag = -3;
             return;
         }
index 945a323..9d4f257 100644 (file)
@@ -21,7 +21,7 @@
 /*--------------------------------------------------------------------------*/
 #include <stdio.h>
 #include <string.h>
-#include "scicos_print.h"
+#include "sciprint.h"
 #include "machine.h"
 #include "charEncoding.h"
 #include "cvstr.h"
@@ -104,7 +104,7 @@ ipar[7:6+lfil] = character codes for file name
         wcfopen(fd, str, "wb");
         if (!fd )
         {
-            scicos_print(_("Could not open the file!\n"));
+            sciprint(_("Could not open the file!\n"));
             *flag = -3;
             return;
         }