undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/nedmalloc-gcc6-warnings'

Browse Source 
Squelch compiler warnings for netmalloc (in compat/) library.

* js/nedmalloc-gcc6-warnings:
  nedmalloc: work around overzealous GCC 6 warning
  nedmalloc: fix misleading indentation
This commit is contained in:
Junio C Hamano 2016-08-08 14:48:42 -07:00
commit ffdcac4bc5
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compat/nedmalloc/nedmalloc.c
View File

@ -955,12 +955,11 @@ void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void **
*/ */
char *strdup(const char *s1) char *strdup(const char *s1)
{ {
char *s2 = 0;
if (s1) {
size_t len = strlen(s1) + 1; size_t len = strlen(s1) + 1;
s2 = malloc(len); char *s2 = malloc(len);
if (s2)
memcpy(s2, s1, len); memcpy(s2, s1, len);
}
return s2; return s2;
} }
#endif #endif