Mercurial > octave-antonio

changeset 10168:37150167a72a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use c-strcase module from gnulib
author John W. Eaton <jwe@octave.org>
date Thu, 21 Jan 2010 01:09:42 -0500
parents 1929ba7bbfb2
children 06bd6e57f889
files ChangeLog bootstrap.conf liboctave/ChangeLog liboctave/Makefile.am liboctave/strcasecmp.c liboctave/strncase.c
diffstat 6 files changed, 11 insertions(+), 108 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 21 01:03:37 2010 -0500
+++ b/ChangeLog	Thu Jan 21 01:09:42 2010 -0500
@@ -1,3 +1,7 @@
+2010-01-21  John W. Eaton  <jwe@octave.org>
+
+	* bootstrap.conf (gnulib_modules): Include c-strcase in the list.
+
 2010-01-21  John W. Eaton  <jwe@octave.org>
 
 	* bootstrap.conf (gnulib_modules): Include getopt-gnu in the list.
--- a/bootstrap.conf	Thu Jan 21 01:03:37 2010 -0500
+++ b/bootstrap.conf	Thu Jan 21 01:09:42 2010 -0500
@@ -18,6 +18,7 @@
 
 # gnulib modules used by this package.
 gnulib_modules="
+  c-strcase
   crypto/md5
   fnmatch
   getopt-gnu
--- a/liboctave/ChangeLog	Thu Jan 21 01:03:37 2010 -0500
+++ b/liboctave/ChangeLog	Thu Jan 21 01:09:42 2010 -0500
@@ -1,3 +1,9 @@
+2010-01-21  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (LIBOCTAVE_C_SOURCES): Remove strcasecmp.c and
+	strncase.c from the list.
+	* strcasecmp.c, strncase.c: Delete.
+
 2010-01-21  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.am (INCS): Remove getopt.h from the list.
--- a/liboctave/Makefile.am	Thu Jan 21 01:03:37 2010 -0500
+++ b/liboctave/Makefile.am	Thu Jan 21 01:09:42 2010 -0500
@@ -465,8 +465,6 @@
   randpoisson.c \
   rename.c \
   rmdir.c \
-  strcasecmp.c \
-  strncase.c \
   strptime.c \
   tempnam.c \
   tempname.c
--- a/liboctave/strcasecmp.c	Thu Jan 21 01:03:37 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library 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.
-
-The GNU C Library 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 the GNU C Library; see the file COPYING.  If
-not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-Fifth Floor, Boston, MA  02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef HAVE_STRCASECMP
-
-#include <ctype.h>
-#include <string.h>
-
-/* Compare S1 and S2, ignoring case, returning less than, equal to or
-   greater than zero if S1 is lexiographically less than,
-   equal to or greater than S2.  */
-int
-strcasecmp (const char *s1, const char *s2)
-{
-  register const unsigned char *p1 = (const unsigned char *) s1;
-  register const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      c1 = tolower (*p1++);
-      c2 = tolower (*p2++);
-      if (c1 == '\0')
-	break;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-}
-
-#endif
--- a/liboctave/strncase.c	Thu Jan 21 01:03:37 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library 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.
-
-The GNU C Library 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 the GNU C Library; see the file COPYING.  If
-not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-Fifth Floor, Boston, MA  02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef HAVE_STRNCASECMP
-
-#include <ctype.h>
-#include <string.h>
-
-/* Compare no more than N characters of S1 and S2,
-   ignoring case, returning less than, equal to or
-   greater than zero if S1 is lexicographically less
-   than, equal to or greater than S2.  */
-int
-strncasecmp (const char *s1, const char *s2, size_t n)
-{
-  register const unsigned char *p1 = (const unsigned char *) s1;
-  register const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-
-  if (p1 == p2 || n == 0)
-    return 0;
-
-  do
-    {
-      c1 = tolower (*p1++);
-      c2 = tolower (*p2++);
-      if (c1 == '\0' || c1 != c2)
-	return c1 - c2;
-    } while (--n > 0);
-
-  return c1 - c2;
-}
-
-#endif