Commit 600cfa2b authored by David Lawrence's avatar David Lawrence
Browse files

184. [cleanup] Variables/functions which began with two leading

                        underscores were made to conform to the ANSI/ISO
                        standard, which says that such names are reserved.
parent 6d8cdbaf
184. [cleanup] Conform variable names hidden in isc_region_consume
and isc_textregion_consume macros to ANSI/ISO
standard (double leading underscores are reserved).
185. [bug] Fixed up handling of ISC_MEMCLUSTER_LEGACY. Several
public functions did not have an isc__ prefix, and
referred to functions that had previously been
renamed.
184. [cleanup] Variables/functions which began with two leading
underscores were made to conform to the ANSI/ISO
standard, which says that such names are reserved.
183. [func] ISC_LOG_PRINTTAG option for log channels. Useful
for logging the program name or other identifier.
......
......@@ -39,9 +39,9 @@
#include <dns/ttl.h>
#define RETERR(x) do { \
isc_result_t __r = (x); \
if (__r != ISC_R_SUCCESS) \
return (__r); \
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return (_r); \
} while (0)
struct dns_master_style {
......
......@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rdata.c,v 1.90 2000/05/15 21:14:07 tale Exp $ */
/* $Id: rdata.c,v 1.91 2000/05/16 05:19:43 tale Exp $ */
#include <config.h>
......@@ -41,9 +41,9 @@
#include <dns/ttl.h>
#define RETERR(x) do { \
isc_result_t __r = (x); \
if (__r != ISC_R_SUCCESS) \
return (__r); \
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return (_r); \
} while (0)
/*
......@@ -741,11 +741,11 @@ dns_mnemonic_totext(unsigned int value, isc_buffer_t *target,
isc_result_t
dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) {
#define COMPARE(__s, __f, __t) \
if (((sizeof(__s) - 1) == source->length) \
&& (strcasecmp(source->base, __s) == 0)) { \
*classp = __t; \
if ((__f & RESERVED) != 0) \
#define COMPARE(string, flags, type) \
if (((sizeof(string) - 1) == source->length) \
&& (strcasecmp(source->base, string) == 0)) { \
*classp = type; \
if ((flags & RESERVED) != 0) \
return (ISC_R_NOTIMPLEMENTED); \
return (ISC_R_SUCCESS); \
}
......
......@@ -31,9 +31,9 @@
#include <dns/ttl.h>
#define RETERR(x) do { \
isc_result_t __r = (x); \
if (__r != ISC_R_SUCCESS) \
return (__r); \
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return (_r); \
} while (0)
......
......@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: base64.c,v 1.12 2000/05/08 14:37:15 tale Exp $ */
/* $Id: base64.c,v 1.13 2000/05/16 05:19:46 tale Exp $ */
#include <config.h>
......@@ -26,9 +26,9 @@
#include <isc/util.h>
#define RETERR(x) do { \
isc_result_t __r = (x); \
if (__r != ISC_R_SUCCESS) \
return (__r); \
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return (_r); \
} while (0)
......
......@@ -580,15 +580,15 @@ isc_buffer_copyregion(isc_buffer_t *b, isc_region_t *r);
* ones beginning with "isc__"
*/
#define ISC__BUFFER_INIT(__b, __base, __length) \
#define ISC__BUFFER_INIT(_b, _base, _length) \
do { \
(__b)->magic = ISC_BUFFER_MAGIC; \
(__b)->base = (__base); \
(__b)->length = (__length); \
(__b)->used = 0; \
(__b)->current = 0; \
(__b)->active = 0; \
(__b)->mctx = NULL; \
(_b)->magic = ISC_BUFFER_MAGIC; \
(_b)->base = (_base); \
(_b)->length = (_length); \
(_b)->used = 0; \
(_b)->current = 0; \
(_b)->active = 0; \
(_b)->mctx = NULL; \
ISC_LINK_INIT(b, link); \
} while (0)
......@@ -688,35 +688,35 @@ isc_buffer_copyregion(isc_buffer_t *b, isc_region_t *r);
#define ISC__BUFFER_PUTUINT8(_b, _val) \
do { \
unsigned char *_cp; \
isc_uint8_t __val2 = (_val); \
isc_uint8_t _val2 = (_val); \
_cp = (_b)->base; \
_cp += (_b)->used; \
(_b)->used++; \
_cp[0] = (__val2 & 0x00ff); \
_cp[0] = (_val2 & 0x00ff); \
} while (0)
#define ISC__BUFFER_PUTUINT16(_b, _val) \
do { \
unsigned char *_cp; \
isc_uint16_t __val2 = (_val); \
isc_uint16_t _val2 = (_val); \
_cp = (_b)->base; \
_cp += (_b)->used; \
(_b)->used += 2; \
_cp[0] = (__val2 & 0xff00U) >> 8; \
_cp[1] = (__val2 & 0x00ffU); \
_cp[0] = (_val2 & 0xff00U) >> 8; \
_cp[1] = (_val2 & 0x00ffU); \
} while (0)
#define ISC__BUFFER_PUTUINT32(_b, _val) \
do { \
unsigned char *_cp; \
isc_uint32_t __val2 = (_val); \
isc_uint32_t _val2 = (_val); \
_cp = (_b)->base; \
_cp += (_b)->used; \
(_b)->used += 4; \
_cp[0] = (__val2 & 0xff000000) >> 24; \
_cp[1] = (__val2 & 0x00ff0000) >> 16; \
_cp[2] = (__val2 & 0x0000ff00) >> 8; \
_cp[3] = (__val2 & 0x000000ff); \
_cp[0] = (_val2 & 0xff000000) >> 24; \
_cp[1] = (_val2 & 0x00ff0000) >> 16; \
_cp[2] = (_val2 & 0x0000ff00) >> 8; \
_cp[3] = (_val2 & 0x000000ff); \
} while (0)
#if defined(ISC_BUFFER_USEINLINE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment