Page MenuHomePhabricator
Differential D13979 Diff 40570 contrib/guix/patches/glibc-versioned-locpath.patch

Changeset View

Standalone View

View Options

contrib/guix/patches/glibc-versioned-locpath.patch

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines
- return NULL; - return NULL;
- } - }
+ __libc_rwlock_unlock (__libc_setlocale_lock); + __libc_rwlock_unlock (__libc_setlocale_lock);
+ return NULL; + return NULL;
} }
if (category == LC_ALL) if (category == LC_ALL)
diff --git a/string/Makefile b/string/Makefile diff --git a/string/Makefile b/string/Makefile
index 8424a61..f925503 100644 index aa2da9ca72..f273c2611d 100644
--- a/string/Makefile --- a/string/Makefile
+++ b/string/Makefile +++ b/string/Makefile
@@ -38,7 +38,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \ @@ -40,7 +40,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
swab strfry memfrob memmem rawmemchr strchrnul \ swab strfry memfrob memmem rawmemchr strchrnul \
$(addprefix argz-,append count create ctsep next \ $(addprefix argz-,append count create ctsep next \
delete extract insert stringify \ delete extract insert stringify \
- addsep replace) \ - addsep replace) \
+ addsep replace suffix) \ + addsep replace suffix) \
envz basename \ envz basename \
strcoll_l strxfrm_l string-inlines memrchr \ strcoll_l strxfrm_l string-inlines memrchr \
xpg-strerror strerror_l xpg-strerror strerror_l
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines
+ +
+ return 0; + return 0;
+ } + }
+ else + else
+ return ENOMEM; + return ENOMEM;
+} +}
+weak_alias (__argz_suffix_entries, argz_suffix_entries) +weak_alias (__argz_suffix_entries, argz_suffix_entries)
diff --git a/string/argz.h b/string/argz.h diff --git a/string/argz.h b/string/argz.h
index bb62a31..d276a35 100644 index 9c496f5ef5..1010a439d8 100644
--- a/string/argz.h --- a/string/argz.h
+++ b/string/argz.h +++ b/string/argz.h
@@ -134,6 +134,16 @@ extern error_t argz_replace (char **__restrict __argz, @@ -108,6 +108,16 @@ extern error_t argz_replace (char **__restrict __argz,
const char *__restrict __str, const char *__restrict __str,
const char *__restrict __with, const char *__restrict __with,
unsigned int *__restrict __replace_count); unsigned int *__restrict __replace_count);
+ +
+/* Suffix each entry of ARGZ & ARGZ_LEN with SUFFIX. Return 0 on success, +/* Suffix each entry of ARGZ & ARGZ_LEN with SUFFIX. Return 0 on success,
+ and ENOMEN if memory cannot be allocated. */ + and ENOMEN if memory cannot be allocated. */
+extern error_t __argz_suffix_entries (char **__restrict __argz, +extern error_t __argz_suffix_entries (char **__restrict __argz,
+ size_t *__restrict __argz_len, + size_t *__restrict __argz_len,
+ const char *__restrict __suffix); + const char *__restrict __suffix);
+extern error_t argz_suffix_entries (char **__restrict __argz, +extern error_t argz_suffix_entries (char **__restrict __argz,
+ size_t *__restrict __argz_len, + size_t *__restrict __argz_len,
+ const char *__restrict __suffix); + const char *__restrict __suffix);
+ +
␌ ␌
/* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there
are no more. If entry is NULL, then the first entry is returned. This are no more. If entry is NULL, then the first entry is returned. This