Module Name: src
Committed By: thorpej
Date: Sat Dec 19 05:55:37 UTC 2009
Modified Files:
src/external/bsd/libelf/dist: _libelf.h elf_scn.c elf_update.c
libelf_allocate.c libelf_ar.c libelf_convert.m4 libelf_ehdr.c
Log Message:
while (0) -> while (/*CONSTCOND*/0)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libelf/dist/_libelf.h \
src/external/bsd/libelf/dist/elf_scn.c \
src/external/bsd/libelf/dist/elf_update.c \
src/external/bsd/libelf/dist/libelf_allocate.c \
src/external/bsd/libelf/dist/libelf_ar.c \
src/external/bsd/libelf/dist/libelf_convert.m4 \
src/external/bsd/libelf/dist/libelf_ehdr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libelf/dist/_libelf.h
diff -u src/external/bsd/libelf/dist/_libelf.h:1.1.1.1 src/external/bsd/libelf/dist/_libelf.h:1.2
--- src/external/bsd/libelf/dist/_libelf.h:1.1.1.1 Sat Dec 19 05:43:39 2009
+++ src/external/bsd/libelf/dist/_libelf.h Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: _libelf.h,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $ */
+/* $NetBSD: _libelf.h,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -63,7 +63,7 @@
#define LIBELF_SET_ERROR(E, O) do { \
LIBELF_PRIVATE(error) = ((ELF_E_##E & LIBELF_ELF_ERROR_MASK)| \
((O) << LIBELF_OS_ERROR_SHIFT)); \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define LIBELF_ADJUST_AR_SIZE(S) (((S) + 1U) & ~1U)
@@ -145,7 +145,7 @@
return (0); \
} \
(DST)->NAME = (SRC)->NAME; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define LIBELF_COPY_S32(DST,SRC,NAME) do { \
if ((SRC)->NAME > INT_MAX || \
@@ -154,7 +154,7 @@
return (0); \
} \
(DST)->NAME = (SRC)->NAME; \
- } while (0)
+ } while (/*CONSTCOND*/0)
/*
Index: src/external/bsd/libelf/dist/elf_scn.c
diff -u src/external/bsd/libelf/dist/elf_scn.c:1.1.1.1 src/external/bsd/libelf/dist/elf_scn.c:1.2
--- src/external/bsd/libelf/dist/elf_scn.c:1.1.1.1 Sat Dec 19 05:43:39 2009
+++ src/external/bsd/libelf/dist/elf_scn.c Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_scn.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $ */
+/* $NetBSD: elf_scn.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libelf/elf_scn.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: elf_scn.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+__RCSID("$NetBSD: elf_scn.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
#include <assert.h>
#include <errno.h>
@@ -63,7 +63,7 @@
LIBELF_SET_ERROR(HEADER, 0); \
return (0); \
} \
- } while (0)
+ } while (/*CONSTCOND*/0)
ec = e->e_class;
fsz = _libelf_fsize(ELF_T_SHDR, ec, e->e_version, (size_t) 1);
Index: src/external/bsd/libelf/dist/elf_update.c
diff -u src/external/bsd/libelf/dist/elf_update.c:1.1.1.1 src/external/bsd/libelf/dist/elf_update.c:1.2
--- src/external/bsd/libelf/dist/elf_update.c:1.1.1.1 Sat Dec 19 05:43:40 2009
+++ src/external/bsd/libelf/dist/elf_update.c Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_update.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $ */
+/* $NetBSD: elf_update.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006-2008 Joseph Koshy
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: elf_update.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+__RCSID("$NetBSD: elf_update.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
#include <sys/mman.h>
#include <sys/param.h>
@@ -430,7 +430,7 @@
(size_t) 1); \
(E)->e_shentsize = _libelf_fsize(ELF_T_SHDR, (EC), (V), \
(size_t) 1); \
- } while (0)
+ } while (/*CONSTCOND*/0)
if (ec == ELFCLASS32)
INITIALIZE_EHDR(eh32, ec, eh_version);
Index: src/external/bsd/libelf/dist/libelf_allocate.c
diff -u src/external/bsd/libelf/dist/libelf_allocate.c:1.1.1.1 src/external/bsd/libelf/dist/libelf_allocate.c:1.2
--- src/external/bsd/libelf/dist/libelf_allocate.c:1.1.1.1 Sat Dec 19 05:43:41 2009
+++ src/external/bsd/libelf/dist/libelf_allocate.c Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf_allocate.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $ */
+/* $NetBSD: libelf_allocate.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: libelf_allocate.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $");
+__RCSID("$NetBSD: libelf_allocate.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
#include <sys/errno.h>
@@ -91,7 +91,7 @@
#define FREE(P) do { \
if (P) \
free(P); \
- } while (0)
+ } while (/*CONSTCOND*/0)
Elf *
Index: src/external/bsd/libelf/dist/libelf_ar.c
diff -u src/external/bsd/libelf/dist/libelf_ar.c:1.1.1.1 src/external/bsd/libelf/dist/libelf_ar.c:1.2
--- src/external/bsd/libelf/dist/libelf_ar.c:1.1.1.1 Sat Dec 19 05:43:41 2009
+++ src/external/bsd/libelf/dist/libelf_ar.c Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf_ar.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $ */
+/* $NetBSD: libelf_ar.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libelf/libelf_ar.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: libelf_ar.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $");
+__RCSID("$NetBSD: libelf_ar.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
#include <ar.h>
#include <assert.h>
@@ -416,7 +416,7 @@
(V) += (P)[1]; (V) <<= 8; \
(V) += (P)[2]; (V) <<= 8; \
(V) += (P)[3]; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define INTSZ 4
Index: src/external/bsd/libelf/dist/libelf_convert.m4
diff -u src/external/bsd/libelf/dist/libelf_convert.m4:1.1.1.1 src/external/bsd/libelf/dist/libelf_convert.m4:1.2
--- src/external/bsd/libelf/dist/libelf_convert.m4:1.1.1.1 Sat Dec 19 05:43:41 2009
+++ src/external/bsd/libelf/dist/libelf_convert.m4 Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf_convert.m4,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $ */
+/* $NetBSD: libelf_convert.m4,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006,2007 Joseph Koshy
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: libelf_convert.m4,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $");
+__RCSID("$NetBSD: libelf_convert.m4,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
#include <sys/types.h>
#include <sys/elf32.h>
@@ -52,7 +52,7 @@
uint16_t _t = _x & 0xFF; \
_t <<= 8; _x >>= 8; _t |= _x & 0xFF; \
(X) = _t; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define SWAP_WORD(X) do { \
uint32_t _x = (uint32_t) (X); \
uint32_t _t = _x & 0xFF; \
@@ -60,7 +60,7 @@
_t <<= 8; _x >>= 8; _t |= _x & 0xFF; \
_t <<= 8; _x >>= 8; _t |= _x & 0xFF; \
(X) = _t; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define SWAP_ADDR32(X) SWAP_WORD(X)
#define SWAP_OFF32(X) SWAP_WORD(X)
#define SWAP_SWORD(X) SWAP_WORD(X)
@@ -75,7 +75,7 @@
_t <<= 8; _x >>= 8; _t |= _x & 0xFF; \
_t <<= 8; _x >>= 8; _t |= _x & 0xFF; \
(X) = _t; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define SWAP_ADDR64(X) SWAP_WORD64(X)
#define SWAP_LWORD(X) SWAP_WORD64(X)
#define SWAP_OFF64(X) SWAP_WORD64(X)
@@ -91,7 +91,7 @@
unsigned char *const _p = (unsigned char *) (P); \
_p[0] = (unsigned char) (X); \
(P) = _p + 1; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define WRITE_HALF(P,X) do { \
uint16_t _t = (X); \
unsigned char *const _p = (unsigned char *) (P); \
@@ -99,7 +99,7 @@
_p[0] = _q[0]; \
_p[1] = _q[1]; \
(P) = _p + 2; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define WRITE_WORD(P,X) do { \
uint32_t _t = (X); \
unsigned char *const _p = (unsigned char *) (P); \
@@ -109,7 +109,7 @@
_p[2] = _q[2]; \
_p[3] = _q[3]; \
(P) = _p + 4; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define WRITE_ADDR32(P,X) WRITE_WORD(P,X)
#define WRITE_OFF32(P,X) WRITE_WORD(P,X)
#define WRITE_SWORD(P,X) WRITE_WORD(P,X)
@@ -126,7 +126,7 @@
_p[6] = _q[6]; \
_p[7] = _q[7]; \
(P) = _p + 8; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define WRITE_ADDR64(P,X) WRITE_WORD64(P,X)
#define WRITE_LWORD(P,X) WRITE_WORD64(P,X)
#define WRITE_OFF64(P,X) WRITE_WORD64(P,X)
@@ -135,7 +135,7 @@
#define WRITE_IDENT(P,X) do { \
(void) memcpy((P), (X), sizeof((X))); \
(P) = (P) + EI_NIDENT; \
- } while (0)
+ } while (/*CONSTCOND*/0)
/*
* Read in various integral values. The source pointer could be
@@ -148,7 +148,7 @@
(const unsigned char *) (P); \
(X) = _p[0]; \
(P) = (P) + 1; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define READ_HALF(P,X) do { \
uint16_t _t; \
unsigned char *const _q = (unsigned char *) &_t; \
@@ -158,7 +158,7 @@
_q[1] = _p[1]; \
(P) = (P) + 2; \
(X) = _t; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define READ_WORD(P,X) do { \
uint32_t _t; \
unsigned char *const _q = (unsigned char *) &_t; \
@@ -170,7 +170,7 @@
_q[3] = _p[3]; \
(P) = (P) + 4; \
(X) = _t; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define READ_ADDR32(P,X) READ_WORD(P,X)
#define READ_OFF32(P,X) READ_WORD(P,X)
#define READ_SWORD(P,X) READ_WORD(P,X)
@@ -189,7 +189,7 @@
_q[7] = _p[7]; \
(P) = (P) + 8; \
(X) = _t; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define READ_ADDR64(P,X) READ_WORD64(P,X)
#define READ_LWORD(P,X) READ_WORD64(P,X)
#define READ_OFF64(P,X) READ_WORD64(P,X)
@@ -198,7 +198,7 @@
#define READ_IDENT(P,X) do { \
(void) memcpy((X), (P), sizeof((X))); \
(P) = (P) + EI_NIDENT; \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define ROUNDUP2(V,N) (V) = ((((V) + (N) - 1)) & ~((N) - 1))
Index: src/external/bsd/libelf/dist/libelf_ehdr.c
diff -u src/external/bsd/libelf/dist/libelf_ehdr.c:1.1.1.1 src/external/bsd/libelf/dist/libelf_ehdr.c:1.2
--- src/external/bsd/libelf/dist/libelf_ehdr.c:1.1.1.1 Sat Dec 19 05:43:41 2009
+++ src/external/bsd/libelf/dist/libelf_ehdr.c Sat Dec 19 05:55:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf_ehdr.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $ */
+/* $NetBSD: libelf_ehdr.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libelf/libelf_ehdr.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: libelf_ehdr.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $");
+__RCSID("$NetBSD: libelf_ehdr.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
#include <assert.h>
#include <gelf.h>
@@ -99,7 +99,7 @@
eh->e_machine = EM_NONE; \
eh->e_type = ELF_K_NONE; \
eh->e_version = LIBELF_PRIVATE(version); \
- } while (0)
+ } while (/*CONSTCOND*/0)
void *
_libelf_ehdr(Elf *e, int ec, int allocate)
