Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kevin
bionic
Commits
2b473070
Commit
2b473070
authored
12 years ago
by
Elliott Hughes
Browse files
Options
Download
Email Patches
Plain Diff
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
parent
547eba0a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
60 additions
and
41 deletions
+60
-41
libc/Android.mk
libc/Android.mk
+1
-1
libc/bionic/strcoll.c
libc/bionic/strcoll.c
+0
-40
libc/upstream-netbsd/libc/string/strcoll.c
libc/upstream-netbsd/libc/string/strcoll.c
+59
-0
No files found.
libc/Android.mk
View file @
2b473070
...
@@ -223,7 +223,6 @@ libc_common_src_files := \
...
@@ -223,7 +223,6 @@ libc_common_src_files := \
bionic/sigsuspend.c
\
bionic/sigsuspend.c
\
bionic/sleep.c
\
bionic/sleep.c
\
bionic/statfs.c
\
bionic/statfs.c
\
bionic/strcoll.c
\
bionic/strndup.c
\
bionic/strndup.c
\
bionic/strnlen.c
\
bionic/strnlen.c
\
bionic/strntoimax.c
\
bionic/strntoimax.c
\
...
@@ -344,6 +343,7 @@ libc_upstream_netbsd_src_files := \
...
@@ -344,6 +343,7 @@ libc_upstream_netbsd_src_files := \
upstream-netbsd/libc/stdlib/tsearch.c
\
upstream-netbsd/libc/stdlib/tsearch.c
\
upstream-netbsd/libc/string/memccpy.c
\
upstream-netbsd/libc/string/memccpy.c
\
upstream-netbsd/libc/string/strcasestr.c
\
upstream-netbsd/libc/string/strcasestr.c
\
upstream-netbsd/libc/string/strcoll.c
\
upstream-netbsd/libc/string/strxfrm.c
\
upstream-netbsd/libc/string/strxfrm.c
\
upstream-netbsd/libc/unistd/killpg.c
\
upstream-netbsd/libc/unistd/killpg.c
\
...
...
This diff is collapsed.
Click to expand it.
libc/bionic/strcoll.c
deleted
100755 → 0
View file @
547eba0a
/*
* Copyright (C) 2009 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <string.h>
/*
* Compare strings using the current locale. Since Bionic really does not
* support locales, we assume we always use the C locale and call strcmp.
*
* This function is provided to make libstdc++-v3 usable.
*/
int
strcoll
(
const
char
*
s1
,
const
char
*
s2
)
{
return
strcmp
(
s1
,
s2
);
}
This diff is collapsed.
Click to expand it.
libc/upstream-netbsd/libc/string/strcoll.c
0 → 100644
View file @
2b473070
/* $NetBSD: strcoll.c,v 1.10 2012/06/25 22:32:46 abs Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Chris Torek.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)strcoll.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID
(
"$NetBSD: strcoll.c,v 1.10 2012/06/25 22:32:46 abs Exp $"
);
#endif
#endif
/* LIBC_SCCS and not lint */
#include <assert.h>
#include <string.h>
/*
* Compare strings according to LC_COLLATE category of current locale.
*/
int
strcoll
(
const
char
*
s1
,
const
char
*
s2
)
{
_DIAGASSERT
(
s1
!=
NULL
);
_DIAGASSERT
(
s2
!=
NULL
);
/* LC_COLLATE is unimplemented, hence always "C" */
return
(
strcmp
(
s1
,
s2
));
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment