use IS_NOT_NULL() and IS_NULL() macro

diff --git a/src/regcomp.c b/src/regcomp.c
index 8197fef1a554ad582fb3e7ee2f1feaeaed49b243..8e2d99bcc1c539b268caf2b1a44088fb8da8ea93 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -45,10 +45,10 @@ make_int_stack(int_stack** rs, int init_size)
   *rs = 0;
 
   s = xmalloc(sizeof(*s));
-  if (s == 0) return ONIGERR_MEMORY;
+  if (IS_NULL(s)) return ONIGERR_MEMORY;
 
   v = (int* )xmalloc(sizeof(int) * init_size);
-  if (v == 0) {
+  if (IS_NULL(v)) {
     xfree(s);
     return ONIGERR_MEMORY;
   }
@@ -64,8 +64,8 @@ make_int_stack(int_stack** rs, int init_size)
 static void
 free_int_stack(int_stack* s)
 {
-  if (s != 0) {
-    if (s->v != 0)
+  if (IS_NOT_NULL(s)) {
+    if (IS_NOT_NULL(s->v))
       xfree(s->v);
     xfree(s);
   }
@@ -77,7 +77,7 @@ int_stack_push(int_stack* s, int v)
   if (s->n >= s->alloc) {
     int new_size = s->alloc * 2;
     int* nv = (int* )xrealloc(s->v, new_size);
-    if (nv == 0) return ONIGERR_MEMORY;
+    if (IS_NULL(nv)) return ONIGERR_MEMORY;
 
     s->alloc = new_size;
     s->v = nv;
@@ -1464,7 +1464,7 @@ compile_length_anchor_node(AnchorNode* node, regex_t* reg)
   int len;
   int tlen = 0;
 
-  if (NODE_ANCHOR_BODY(node) != 0) {
+  if (IS_NOT_NULL(NODE_ANCHOR_BODY(node))) {
     tlen = compile_length_tree(NODE_ANCHOR_BODY(node), reg);
     if (tlen < 0) return tlen;
   }
@@ -1688,7 +1688,7 @@ compile_tree(Node* node, regex_t* reg)
       len = 0;
       do {
         len += compile_length_tree(NCAR(x), reg);
-        if (NCDR(x) != NULL) {
+        if (IS_NOT_NULL(NCDR(x))) {
           len += SIZE_OP_PUSH + SIZE_OP_JUMP;
         }
       } while (IS_NOT_NULL(x = NCDR(x)));
@@ -1886,7 +1886,7 @@ noname_disable_map(Node** plink, GroupNumRemap* map, int* counter)
     break;
 
   case NT_ANCHOR:
-    if (NODE_BODY(node) != 0)
+    if (IS_NOT_NULL(NODE_BODY(node)))
       r = noname_disable_map(&(NODE_BODY(node)), map, counter);
     break;
 
@@ -1949,7 +1949,7 @@ renumber_by_map(Node* node, GroupNumRemap* map)
     break;
 
   case NT_ANCHOR:
-    if (NODE_BODY(node) != 0)
+    if (IS_NOT_NULL(NODE_BODY(node)))
       r = renumber_by_map(NODE_BODY(node), map);
     break;
 
@@ -1985,7 +1985,7 @@ numbered_ref_check(Node* node)
     break;
 
   case NT_ANCHOR:
-    if (NODE_BODY(node) != 0)
+    if (IS_NOT_NULL(NODE_BODY(node)))
       r = numbered_ref_check(NODE_BODY(node));
     break;
 
@@ -2492,7 +2492,7 @@ check_type_tree(Node* node, int type_mask, int enclose_mask, int anchor_mask)
     if ((type & anchor_mask) == 0)
       return 1;
 
-    if (NODE_BODY(node) != 0)
+    if (IS_NOT_NULL(NODE_BODY(node)))
       r = check_type_tree(NODE_BODY(node), type_mask, enclose_mask, anchor_mask);
     break;
 
@@ -3112,7 +3112,7 @@ divide_look_behind_alternatives(Node* node)
   NODE_BODY(head) = np;
 
   np = node;
-  while ((np = NCDR(np)) != NULL_NODE) {
+  while (IS_NOT_NULL(np = NCDR(np))) {
     insert_node = onig_node_new_anchor(anc_type);
     CHECK_NULL_RETURN_MEMERR(insert_node);
     NODE_BODY(insert_node) = NCAR(np);
@@ -3123,7 +3123,7 @@ divide_look_behind_alternatives(Node* node)
     np = node;
     do {
       SET_NODE_TYPE(np, NT_LIST);  /* alt -> list */
-    } while ((np = NCDR(np)) != NULL_NODE);
+    } while (IS_NOT_NULL(np = NCDR(np)));
   }
   return 0;
 }

diff --git a/src/regexec.c b/src/regexec.c
index f72e60d870875750d7c82bf6b7f0f3ca3ba7ef08..5ac5c4370f328d32dc0651513d2082e45a896f4b 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -533,7 +533,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
 #define STATE_CHECK_POS(s,snum) \
   (((s) - str) * num_comb_exp_check + ((snum) - 1))
 #define STATE_CHECK_VAL(v,snum) do {\
-  if (state_check_buff != NULL) {\
+  if (IS_NOT_NULL(state_check_buff)) {\
     int x = STATE_CHECK_POS(s,snum);\
     (v) = state_check_buff[x/8] & (1<<(x%8));\
   }\
@@ -570,12 +570,12 @@ stack_double(int is_alloca, char** arg_alloc_base,
   stk->u.state.pcode     = (pat);\
   stk->u.state.pstr      = (s);\
   stk->u.state.pstr_prev = (sprev);\
-  stk->u.state.state_check = ((state_check_buff != NULL) ? (snum) : 0);\
+  stk->u.state.state_check = (IS_NOT_NULL(state_check_buff) ? (snum) : 0);\
   STACK_INC;\
 } while(0)
 
 #define STACK_PUSH_STATE_CHECK(s,snum) do {\
-  if (state_check_buff != NULL) {\
+  if (IS_NOT_NULL(state_check_buff)) {   \
     STACK_ENSURE(1);\
     stk->type = STK_STATE_CHECK_MARK;\
     stk->u.state.pstr = (s);\
@@ -1157,7 +1157,7 @@ static int backref_match_at_nested_level(regex_t* reg
       if (k->type == STK_MEM_START) {
         if (mem_is_in_memp(k->u.mem.num, mem_num, memp)) {
           pstart = k->u.mem.pstr;
-          if (pend != NULL_UCHARP) {
+          if (IS_NOT_NULL(pend)) {
             if (pend - pstart > send - *s) return 0; /* or goto next_mem; */
             p  = pstart;
             ss = *s;