mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Replace DE_CONST(k, v) with v = UNCONST(k) macro

Browse Source 
Replace the complicated DE_CONST macro that required union with much
simple reference-dereference trick in the UNCONST() macro.
This commit is contained in:
Ondřej Surý
2023-03-30 22:34:12 +02:00
parent 2351c746a9
commit 3a6a0fa867
28 changed files with 82 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/isc/log.c
View File

@@ -456,7 +456,7 @@ isc_logconfig_destroy(isc_logconfig_t **lcfgp) {
* but in isc_log_createchannel it gets copied
* into writable memory and is not longer truly const.
*/
DE_CONST(FILE_NAME(channel), filename);
filename = UNCONST(FILE_NAME(channel));
isc_mem_free(mctx, filename);
if (FILE_STREAM(channel) != NULL) {
@@ -522,7 +522,7 @@ isc_log_registercategories(isc_log_t *lctx, isc_logcategory_t categories[]) {
* The name pointer points to the next array.
* Ick.
*/
DE_CONST(catp->name, catp);
catp = UNCONST(catp->name);
} else {
catp++;
}
@@ -553,7 +553,7 @@ isc_log_categorybyname(isc_log_t *lctx, const char *name) {
* catp is neither modified nor returned to the
* caller, so removing its const qualifier is ok.
*/
DE_CONST(catp->name, catp);
catp = UNCONST(catp->name);
} else {
if (strcmp(catp->name, name) == 0) {
return (catp);
@@ -593,7 +593,7 @@ isc_log_registermodules(isc_log_t *lctx, isc_logmodule_t modules[]) {
* The name pointer points to the next array.
* Ick.
*/
DE_CONST(modp->name, modp);
modp = UNCONST(modp->name);
} else {
modp++;
}
@@ -624,7 +624,7 @@ isc_log_modulebyname(isc_log_t *lctx, const char *name) {
* modp is neither modified nor returned to the
* caller, so removing its const qualifier is ok.
*/
DE_CONST(modp->name, modp);
modp = UNCONST(modp->name);
} else {
if (strcmp(modp->name, name) == 0) {
return (modp);
@@ -1020,7 +1020,7 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) {
char sep = '/';
/*
* It is safe to DE_CONST the file.name because it was copied
* It is safe to UNCONST the file.name because it was copied
* with isc_mem_strdup().
*/
bname = strrchr(file->name, sep);
@@ -1028,7 +1028,7 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) {
*bname++ = '\0';
dirname = file->name;
} else {
DE_CONST(file->name, bname);
bname = UNCONST(file->name);
dirname = ".";
}
bnamelen = strlen(bname);
@@ -1152,7 +1152,7 @@ remove_old_tsversions(isc_logfile_t *file, int versions) {
char sep = '/';
/*
* It is safe to DE_CONST the file.name because it was copied
* It is safe to UNCONST the file.name because it was copied
* with isc_mem_strdup().
*/
bname = strrchr(file->name, sep);
@@ -1160,7 +1160,7 @@ remove_old_tsversions(isc_logfile_t *file, int versions) {
*bname++ = '\0';
dirname = file->name;
} else {
DE_CONST(file->name, bname);
bname = UNCONST(file->name);
dirname = ".";
}
bnamelen = strlen(bname);