projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(error_tail): Don't cast alloca to (void *); it's already (void *).
[gnulib.git]
/
lib
/
path-concat.c
diff --git
a/lib/path-concat.c
b/lib/path-concat.c
index
622d5d7
..
7f3bc5a
100644
(file)
--- a/
lib/path-concat.c
+++ b/
lib/path-concat.c
@@
-1,5
+1,7
@@
/* path-concat.c -- concatenate two arbitrary pathnames
/* path-concat.c -- concatenate two arbitrary pathnames
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free
+ Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-26,31
+28,13
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-# include <strings.h>
-# endif
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifndef HAVE_DECL_MALLOC
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MALLOC
-char *malloc ();
-#endif
-
#ifndef strdup
char *strdup ();
#endif
#ifndef strdup
char *strdup ();
#endif
@@
-121,7
+105,7
@@
char *
xpath_concat (const char *dir, const char *base, char **base_in_result)
{
char *res = path_concat (dir, base, base_in_result);
xpath_concat (const char *dir, const char *base, char **base_in_result)
{
char *res = path_concat (dir, base, base_in_result);
- if (res)
-
return res
;
-
xalloc_die ()
;
+ if (
!
res)
+
xalloc_die ()
;
+
return res
;
}
}