From fd2696a55a649cbe024f24ad5dae97cd24bd20e6 Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Sat, 9 Jan 2010 11:35:57 +0100 Subject: [PATCH] correct macro parameter parentizing --- src/nobug.h | 100 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/nobug.h b/src/nobug.h index fcb586e..05e75e0 100644 --- a/src/nobug.h +++ b/src/nobug.h @@ -1117,14 +1117,14 @@ nobug_env_init_flag (&NOBUG_FLAG(name), NOBUG_LOG_TARGET, default) NOBUG_IF(NOBUG_RESOURCE_LOGGING, \ NOBUG_LOG_(flag, NOBUG_RESOURCE_LOG_LEVEL, NOBUG_LOCATION_INFO, \ "RESOURCE_FORGET", "%s: %s@%p", \ - handle?handle->type:"", \ - handle?handle->hdr.name:"", \ - handle?handle->object_id:NULL);) \ + (handle)?(handle)->type:"", \ + (handle)?(handle)->hdr.name:"", \ + (handle)?(handle)->object_id:NULL);) \ NOBUG_RESOURCE_ASSERT(nobug_resource_forget (handle), \ "RESOURCE_ASSERT_FORGET", NOBUG_LOCATION_INFO, "%s: %s@%p: %s", \ - handle?handle->type:"", \ - handle?handle->hdr.name:"", \ - handle?handle->object_id:NULL, \ + (handle)?(handle)->type:"", \ + (handle)?(handle)->hdr.name:"", \ + (handle)?(handle)->object_id:NULL, \ nobug_resource_error); \ handle = NULL; \ NOBUG_RESOURCE_UNLOCK; \ @@ -1156,15 +1156,15 @@ nobug_env_init_flag (&NOBUG_FLAG(name), NOBUG_LOG_TARGET, default) NOBUG_IF_ALPHA( \ do { \ NOBUG_REQUIRE(resource, "Announced resource handle not initialized"); \ - NOBUG_REQUIRE(!handle, "Resource handle already entered"); \ + NOBUG_REQUIRE(!(handle), "Resource handle already entered"); \ NOBUG_RESOURCE_LOCK; \ NOBUG_IF(NOBUG_RESOURCE_LOGGING, \ NOBUG_LOG_(&NOBUG_FLAG(flag), NOBUG_RESOURCE_LOG_LEVEL, \ NOBUG_LOCATION_INFO, "RESOURCE_ENTER", \ "%s: %s@%p: %s: %s", \ - resource?resource->type:"", \ - resource?resource->hdr.name:"", \ - resource?resource->object_id:NULL, \ + (resource)?(resource)->type:"", \ + (resource)?(resource)->hdr.name:"", \ + (resource)?(resource)->object_id:NULL, \ user, \ nobug_resource_states[state]);) \ NOBUG_RESOURCE_ASSERT(handle = \ @@ -1173,9 +1173,9 @@ nobug_env_init_flag (&NOBUG_FLAG(name), NOBUG_LOG_TARGET, default) NOBUG_BASENAME(__FILE__ ":" NOBUG_STRINGIZE(__LINE__))), \ "RESOURCE_ASSERT_ENTER", NOBUG_LOCATION_INFO, \ "%s: %s@%p: %s: %s: %s", \ - resource?resource->type:"", \ - resource?resource->hdr.name:"", \ - resource?resource->object_id:NULL, \ + (resource)?(resource)->type:"", \ + (resource)?(resource)->hdr.name:"", \ + (resource)?(resource)->object_id:NULL, \ user, nobug_resource_states[state], \ nobug_resource_error); \ NOBUG_RESOURCE_UNLOCK; \ @@ -1219,33 +1219,33 @@ nobug_env_init_flag (&NOBUG_FLAG(name), NOBUG_LOG_TARGET, default) #define NOBUG_RESOURCE_STATE(flag, state, entered) \ NOBUG_RESOURCE_STATE_RAW(&NOBUG_FLAG(flag), state, entered) -#define NOBUG_RESOURCE_STATE_RAW(flag, nstate, entered) \ - NOBUG_IF_ALPHA( \ - do { \ - NOBUG_RESOURCE_LOCK; \ - NOBUG_IF(NOBUG_RESOURCE_LOGGING, \ - NOBUG_LOG_(flag, NOBUG_RESOURCE_LOG_LEVEL, NOBUG_LOCATION_INFO, \ - "RESOURCE_STATE", "%s: %s@%p: %s: %s->%s", \ - entered?entered->current->resource->type:"", \ - entered?entered->current->resource->hdr.name:"", \ - entered?entered->current->resource->object_id:"", \ - entered?entered->hdr.name:"", \ - nobug_resource_states[entered?entered->state \ - :NOBUG_RESOURCE_INVALID], \ - nobug_resource_states[nstate]); \ - ) \ - NOBUG_RESOURCE_ASSERT(nobug_resource_state (entered, nstate), \ - "RESOURCE_ASSERT_STATE", NOBUG_LOCATION_INFO, \ - "%s: %s@%p: %s: %s->%s: %s", \ - entered?entered->current->resource->type:"", \ - entered?entered->current->resource->hdr.name:"", \ - entered?entered->current->resource->object_id:"", \ - entered?entered->hdr.name:"", \ - nobug_resource_states[entered?entered->state \ - :NOBUG_RESOURCE_INVALID], \ - nobug_resource_states[nstate], \ - nobug_resource_error); \ - NOBUG_RESOURCE_UNLOCK; \ +#define NOBUG_RESOURCE_STATE_RAW(flag, nstate, entered) \ + NOBUG_IF_ALPHA( \ + do { \ + NOBUG_RESOURCE_LOCK; \ + NOBUG_IF(NOBUG_RESOURCE_LOGGING, \ + NOBUG_LOG_(flag, NOBUG_RESOURCE_LOG_LEVEL, NOBUG_LOCATION_INFO, \ + "RESOURCE_STATE", "%s: %s@%p: %s: %s->%s", \ + (entered)?(entered)->current->resource->type:"", \ + (entered)?(entered)->current->resource->hdr.name:"", \ + (entered)?(entered)->current->resource->object_id:"", \ + (entered)?(entered)->hdr.name:"", \ + nobug_resource_states[(entered)?(entered)->state \ + :NOBUG_RESOURCE_INVALID], \ + nobug_resource_states[nstate]); \ + ) \ + NOBUG_RESOURCE_ASSERT(nobug_resource_state ((entered), nstate), \ + "RESOURCE_ASSERT_STATE", NOBUG_LOCATION_INFO, \ + "%s: %s@%p: %s: %s->%s: %s", \ + (entered)?(entered)->current->resource->type:"", \ + (entered)?(entered)->current->resource->hdr.name:"", \ + (entered)?(entered)->current->resource->object_id:"", \ + (entered)?(entered)->hdr.name:"", \ + nobug_resource_states[(entered)?(entered)->state \ + :NOBUG_RESOURCE_INVALID], \ + nobug_resource_states[nstate], \ + nobug_resource_error); \ + NOBUG_RESOURCE_UNLOCK; \ } while (0)) @@ -1287,21 +1287,21 @@ nobug_env_init_flag (&NOBUG_FLAG(name), NOBUG_LOG_TARGET, default) NOBUG_IF(NOBUG_RESOURCE_LOGGING, \ NOBUG_LOG_(flag, NOBUG_RESOURCE_LOG_LEVEL, NOBUG_LOCATION_INFO, \ "RESOURCE_LEAVE", "%s: %s@%p: %s: %s", \ - handle?handle->current->resource->type:"", \ - handle?handle->current->resource->hdr.name:"", \ - handle?handle->current->resource->object_id:"", \ - handle?handle->hdr.name:"", \ - nobug_resource_states[handle?handle->state \ + (handle)?(handle)->current->resource->type:"", \ + (handle)?(handle)->current->resource->hdr.name:"", \ + (handle)?(handle)->current->resource->object_id:"", \ + (handle)?(handle)->hdr.name:"", \ + nobug_resource_states[(handle)?(handle)->state \ :NOBUG_RESOURCE_INVALID]); \ ) \ NOBUG_RESOURCE_ASSERT(nobug_resource_leave (handle), \ "RESOURCE_ASSERT_LEAVE", NOBUG_LOCATION_INFO, \ "%s: %s@%p: %s: %s: %s", \ - handle?handle->current->resource->type:"", \ - handle?handle->current->resource->hdr.name:"", \ - handle?handle->current->resource->object_id:"", \ - handle?handle->hdr.name:"", \ - nobug_resource_states[handle?handle->state \ + (handle)?(handle)->current->resource->type:"", \ + (handle)?(handle)->current->resource->hdr.name:"", \ + (handle)?(handle)->current->resource->object_id:"", \ + (handle)?(handle)->hdr.name:"", \ + nobug_resource_states[(handle)?(handle)->state \ :NOBUG_RESOURCE_INVALID], \ nobug_resource_error); \ handle = NULL; \ -- 2.11.4.GIT