Delete some useless code (strcatfunction). Found thanks to the code coverage: http... 70/10870/2
Sylvestre Ledru [Mon, 18 Mar 2013 10:53:00 +0000 (11:53 +0100)]
Change-Id: I56cbe55ab11948a1c7c5115e519d78527e2e3e49

scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/strcatfunction.c [deleted file]
scilab/modules/string/src/c/strcatfunction.h [deleted file]
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters

index 932cdcf..7ef19c6 100644 (file)
@@ -8,7 +8,6 @@ src/c/stripblanks.c \
 src/c/convstr.c \
 src/c/men_Sutils.c \
 src/c/tokens.c \
-src/c/strcatfunction.c \
 src/c/strsplitfunction.c \
 src/c/partfunction.c \
 src/c/InitializeString.c \
index 02d88b5..772cf2f 100644 (file)
@@ -138,7 +138,6 @@ am__objects_1 = libscistring_algo_la-code2str.lo \
        libscistring_algo_la-convstr.lo \
        libscistring_algo_la-men_Sutils.lo \
        libscistring_algo_la-tokens.lo \
-       libscistring_algo_la-strcatfunction.lo \
        libscistring_algo_la-strsplitfunction.lo \
        libscistring_algo_la-partfunction.lo \
        libscistring_algo_la-InitializeString.lo \
@@ -481,7 +480,6 @@ src/c/stripblanks.c \
 src/c/convstr.c \
 src/c/men_Sutils.c \
 src/c/tokens.c \
-src/c/strcatfunction.c \
 src/c/strsplitfunction.c \
 src/c/partfunction.c \
 src/c/InitializeString.c \
@@ -750,7 +748,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-pcre_private.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-scistrtostr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-setScilabCharactersCodes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-strcatfunction.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-stringToDouble.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-stringsCompare.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscistring_algo_la-stringsstrrchr.Plo@am__quote@
@@ -847,13 +844,6 @@ libscistring_algo_la-tokens.lo: src/c/tokens.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscistring_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscistring_algo_la-tokens.lo `test -f 'src/c/tokens.c' || echo '$(srcdir)/'`src/c/tokens.c
 
-libscistring_algo_la-strcatfunction.lo: src/c/strcatfunction.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscistring_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscistring_algo_la-strcatfunction.lo -MD -MP -MF $(DEPDIR)/libscistring_algo_la-strcatfunction.Tpo -c -o libscistring_algo_la-strcatfunction.lo `test -f 'src/c/strcatfunction.c' || echo '$(srcdir)/'`src/c/strcatfunction.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscistring_algo_la-strcatfunction.Tpo $(DEPDIR)/libscistring_algo_la-strcatfunction.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/strcatfunction.c' object='libscistring_algo_la-strcatfunction.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscistring_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscistring_algo_la-strcatfunction.lo `test -f 'src/c/strcatfunction.c' || echo '$(srcdir)/'`src/c/strcatfunction.c
-
 libscistring_algo_la-strsplitfunction.lo: src/c/strsplitfunction.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscistring_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscistring_algo_la-strsplitfunction.lo -MD -MP -MF $(DEPDIR)/libscistring_algo_la-strsplitfunction.Tpo -c -o libscistring_algo_la-strsplitfunction.lo `test -f 'src/c/strsplitfunction.c' || echo '$(srcdir)/'`src/c/strsplitfunction.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscistring_algo_la-strsplitfunction.Tpo $(DEPDIR)/libscistring_algo_la-strsplitfunction.Plo
diff --git a/scilab/modules/string/src/c/strcatfunction.c b/scilab/modules/string/src/c/strcatfunction.c
deleted file mode 100644 (file)
index 16cae43..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*------------------------------------------------------------------------*/
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Cong WU
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-/* desc : conconcatenate: character strings                                  */
-/*        The main function                                               */
-/*                                                                        */
-/*------------------------------------------------------------------------*/
-#include <string.h>
-#include "stack-c.h"
-#include "MALLOC.h"
-#include "strcatfunction.h"
-/*----------------------------------------------------------------------------*/
-BOOL strcatfunction(char **Input_String_One,char **Input_String_Two,int Number_Input_One,char **Output_StringMatrix)
-{
-       int x = 0;
-
-       if (Number_Input_One > 1)
-       {
-               /* Travers for every argument*/
-               for (x = 1; x < (Number_Input_One-1) ;++x)
-               {
-                       if (strlen(Input_String_Two[0]) == 0) return FALSE;
-
-                       /* Put the each of the two argument together */
-                       strcat(Output_StringMatrix[0],Input_String_One[x]);
-                       strcat(Output_StringMatrix[0] ,Input_String_Two[0]);
-               }
-               strcat(Output_StringMatrix[0] ,Input_String_One[Number_Input_One-1]);
-       }
-       return TRUE;
-}
-/*----------------------------------------------------------------------------*/
diff --git a/scilab/modules/string/src/c/strcatfunction.h b/scilab/modules/string/src/c/strcatfunction.h
deleted file mode 100644 (file)
index 00f6fa8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-/*----------------------------------------------------------------------------*/
-#ifndef __STRCATFUNCTION_H__
-#define __STRCATFUNCTION_H__
-#define STAR '*'
-#define COL 'c'
-#define ROW 'r'
-/*------------------------------------------------------------------------*/
-/**
-* strcatfunction
-* description To connect the two strings
-* @param[in] Input_String_One
-* @param[in] Input_String_Two
-* @param[in] Num_of_Input
-* @param[out] Output_StringMatrix
-* @return bool 
-*/
-/*------------------------------------------------------------------------*/
-BOOL strcatfunction(char **Input_String_One,char **Input_String_Two,int Num_of_Input,char **Output_StringMatrix);
-
-#endif /* __STRCATFUNCTION_H__ */
-/*----------------------------------------------------------------------------*/
index 4d35ba8..e4c6813 100644 (file)
@@ -326,7 +326,6 @@ lib /DEF:"$(ProjectDir)functions_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     <ClInclude Include="pcre_error.h" />
     <ClInclude Include="pcre_internal.h" />
     <ClInclude Include="setScilabCharactersCodes.h" />
-    <ClInclude Include="strcatfunction.h" />
     <ClInclude Include="stringsCompare.h" />
     <ClInclude Include="stringsstrrchr.h" />
     <ClInclude Include="stringsstrrev.h" />
@@ -337,4 +336,4 @@ lib /DEF:"$(ProjectDir)functions_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 7c33014..d11be14 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClInclude Include="setScilabCharactersCodes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="strcatfunction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stringsCompare.h">
       <Filter>Header Files</Filter>
     </ClInclude>
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>