X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=util%2Fres.c;h=df6d2217a488b14b59b8c55e517620706706a45b;hb=d310ea540d84722bcda486995c29b4dd2b08cb61;hp=cbc51ec560757e38af71556da300420ff90bb4ce;hpb=9f7d2fac648dbdba81e007f08ba3fbbb33c273b9;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index cbc51ec..df6d221 100644 --- a/util/res.c +++ b/util/res.c @@ -1,4 +1,4 @@ -/* $Id: res.c,v 1.36 2004-06-15 08:05:54 adam Exp $ +/* $Id: res.c,v 1.37.2.2 2006-08-14 10:39:24 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -15,11 +15,10 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. -*/ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include #include @@ -32,7 +31,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include -#include struct res_entry { char *name; @@ -146,8 +144,6 @@ static void reread (Res r) assert (r); r->init = 1; - val_buf = (char*) xmalloc (val_max); - if (!r->name) return; @@ -157,6 +153,7 @@ static void reread (Res r) logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", r->name); return ; } + val_buf = (char*) xmalloc (val_max); while (1) { line = fgets (fr_buf, sizeof(fr_buf)-1, fr);