X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fresres.c;h=570cc5fc77a1075cd8f2c347618dc38ef3fda57f;hb=128e85e3ab36b8e30f6612fb50de3cbb4ede6824;hp=9f90df0a506919d52b12f79da107d0563eae7a51;hpb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/resres.c b/binutils/resres.c index 9f90df0a50..570cc5fc77 100644 --- a/binutils/resres.c +++ b/binutils/resres.c @@ -1,6 +1,5 @@ /* resres.c: read_res_file and write_res_file implementation for windres. - Copyright 1998, 1999, 2001, 2002, 2005, 2007, 2008 - Free Software Foundation, Inc. + Copyright (C) 1998-2016 Free Software Foundation, Inc. Written by Anders Norlander . Rewritten by Kai Tietz, Onevision. @@ -32,7 +31,6 @@ #include "windres.h" #include -#include static rc_uint_type write_res_directory (windres_bfd *, rc_uint_type, const rc_res_directory *, const rc_res_id *, @@ -98,7 +96,7 @@ read_res_file (const char *fn) off = 0; if (! probe_binary (&wrbfd, flen)) - set_windres_bfd_endianess (&wrbfd, ! target_is_bigendian); + set_windres_bfd_endianness (&wrbfd, ! target_is_bigendian); skip_null_resource (&wrbfd, &off, flen); @@ -388,8 +386,7 @@ write_res_bin (windres_bfd *wrbfd, rc_uint_type off, const rc_res_resource *res, /* Get number of bytes needed to store an id in binary format */ static unsigned long -get_id_size (id) - const rc_res_id *id; +get_id_size (const rc_res_id *id) { if (id->named) return sizeof (unichar) * (id->u.n.length + 1); @@ -501,7 +498,7 @@ write_res_info (windres_bfd *wrbfd, rc_uint_type off, const rc_res_res_info *inf if (wrbfd) { struct bin_res_info l; - + windres_put_32 (wrbfd, l.version, info->version); windres_put_16 (wrbfd, l.memflags, info->memflags); windres_put_16 (wrbfd, l.language, info->language); @@ -660,17 +657,13 @@ res_append_resource (rc_res_directory **res_dirs, rc_res_resource *resource, if (*res_dirs == NULL) { - static unsigned long timeval; - - /* Use the same timestamp for every resource created in a - single run. */ - if (timeval == 0) - timeval = time (NULL); - *res_dirs = ((rc_res_directory *) res_alloc (sizeof (rc_res_directory))); + (*res_dirs)->characteristics = 0; - (*res_dirs)->time = timeval; + /* Using a real timestamp only serves to create non-deterministic + results. Use zero instead. */ + (*res_dirs)->time = 0; (*res_dirs)->major = 0; (*res_dirs)->minor = 0; (*res_dirs)->entries = NULL;