[BACK]Return to magic-test.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / file

Diff for /src/usr.bin/file/magic-test.c between version 1.17 and 1.18

version 1.17, 2016/04/30 21:10:28 version 1.18, 2016/04/30 21:42:11
Line 1054 
Line 1054 
 magic_test_type_default(__unused struct magic_line *ml,  magic_test_type_default(__unused struct magic_line *ml,
     __unused struct magic_state *ms)      __unused struct magic_state *ms)
 {  {
         return (1);          return (!ms->matched);
 }  }
   
 static int (*magic_test_functions[])(struct magic_line *,  static int (*magic_test_functions[])(struct magic_line *,
Line 1219 
Line 1219 
             ml->type_string, ml->test_operator, offset, ms->offset,              ml->type_string, ml->test_operator, offset, ms->offset,
             ml->result == NULL ? "" : ml->result);              ml->result == NULL ? "" : ml->result);
   
           ms->matched = 0;
         offset = ms->offset;          offset = ms->offset;
         TAILQ_FOREACH(child, &ml->children, entry) {          TAILQ_FOREACH(child, &ml->children, entry) {
                 ms->offset = offset;                  ms->offset = offset;
                 magic_test_line(child, ms);                  magic_test_line(child, ms);
         }          }
   
           ms->matched = 1;
         return (ml->result != NULL);          return (ml->result != NULL);
 }  }
   
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18