From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttaku-0008WJ-5f for qemu-devel@nongnu.org; Fri, 11 Jan 2013 04:18:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ttakq-0005f9-Om for qemu-devel@nongnu.org; Fri, 11 Jan 2013 04:18:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttakq-0005f3-Gq for qemu-devel@nongnu.org; Fri, 11 Jan 2013 04:18:24 -0500 From: Stefan Hajnoczi Date: Fri, 11 Jan 2013 10:18:05 +0100 Message-Id: <1357895886-14283-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1357895886-14283-1-git-send-email-stefanha@redhat.com> References: <1357895886-14283-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 5/6] Replace remaining gmtime, localtime by gmtime_r, localtime_r List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , Anthony Liguori , Stefan Hajnoczi From: Stefan Weil This allows removing of MinGW specific code and improves reentrancy for POSIX hosts. [Removed unused ret variable in qemu_get_timedate() to fix warning: vl.c: In function =E2=80=98qemu_get_timedate=E2=80=99: vl.c:451:16: error: variable =E2=80=98ret=E2=80=99 set but not used [-Wer= ror=3Dunused-but-set-variable] -- Stefan Hajnoczi] Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- block.c | 10 ---------- block/vvfat.c | 4 ---- hw/omap1.c | 2 +- vl.c | 9 +++------ 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/block.c b/block.c index 4e28c55..60873ea 100644 --- a/block.c +++ b/block.c @@ -3338,11 +3338,7 @@ char *get_human_readable_size(char *buf, int buf_s= ize, int64_t size) char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) { char buf1[128], date_buf[128], clock_buf[128]; -#ifdef _WIN32 - struct tm *ptm; -#else struct tm tm; -#endif time_t ti; int64_t secs; =20 @@ -3352,15 +3348,9 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, = QEMUSnapshotInfo *sn) "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK"); } else { ti =3D sn->date_sec; -#ifdef _WIN32 - ptm =3D localtime(&ti); - strftime(date_buf, sizeof(date_buf), - "%Y-%m-%d %H:%M:%S", ptm); -#else localtime_r(&ti, &tm); strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm); -#endif secs =3D sn->vm_clock_nsec / 1000000000; snprintf(clock_buf, sizeof(clock_buf), "%02d:%02d:%02d.%03d", diff --git a/block/vvfat.c b/block/vvfat.c index 83706ce..06e6654 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -529,13 +529,9 @@ static inline uint8_t fat_chksum(const direntry_t* e= ntry) /* if return_time=3D=3D0, this returns the fat_date, else the fat_time *= / static uint16_t fat_datetime(time_t time,int return_time) { struct tm* t; -#ifdef _WIN32 - t=3Dlocaltime(&time); /* this is not thread safe */ -#else struct tm t1; t =3D &t1; localtime_r(&time,t); -#endif if(return_time) return cpu_to_le16((t->tm_sec/2)|(t->tm_min<<5)|(t->tm_hour<<11)); return cpu_to_le16((t->tm_mday)|((t->tm_mon+1)<<5)|((t->tm_year-80)<= <9)); diff --git a/hw/omap1.c b/hw/omap1.c index 8536e96..e85f2e2 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -2830,7 +2830,7 @@ static void omap_rtc_tick(void *opaque) s->round =3D 0; } =20 - memcpy(&s->current_tm, localtime(&s->ti), sizeof(s->current_tm)); + localtime_r(&s->ti, &s->current_tm); =20 if ((s->interrupts & 0x08) && s->ti =3D=3D s->alarm_ti) { s->status |=3D 0x40; diff --git a/vl.c b/vl.c index f056c95..aed4182 100644 --- a/vl.c +++ b/vl.c @@ -448,21 +448,18 @@ StatusInfo *qmp_query_status(Error **errp) void qemu_get_timedate(struct tm *tm, int offset) { time_t ti; - struct tm *ret; =20 time(&ti); ti +=3D offset; if (rtc_date_offset =3D=3D -1) { if (rtc_utc) - ret =3D gmtime(&ti); + gmtime_r(&ti, tm); else - ret =3D localtime(&ti); + localtime_r(&ti, tm); } else { ti -=3D rtc_date_offset; - ret =3D gmtime(&ti); + gmtime_r(&ti, tm); } - - memcpy(tm, ret, sizeof(struct tm)); } =20 int qemu_timedate_diff(struct tm *tm) --=20 1.8.0.2