From: Jim Meyering Date: Sat, 23 Feb 2002 09:02:18 +0000 (+0000) Subject: (xpath_concat): Reorder code to pacify X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17bef6778d88a558ae4b059d649a44b00754c38c;p=pspp (xpath_concat): Reorder code to pacify compilers that don't know that xalloc_die never returns. --- diff --git a/lib/path-concat.c b/lib/path-concat.c index 622d5d73b6..3a143c7aaa 100644 --- a/lib/path-concat.c +++ b/lib/path-concat.c @@ -1,5 +1,7 @@ /* 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 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 @@ -121,7 +123,7 @@ char * 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; }