Explorar el Código

cmPgmOpts.c : Fix bug where 'flag' type was always reported as 'required'.

master
kevin hace 4 años
padre
commit
ce2412aae3
Se han modificado 1 ficheros con 5 adiciones y 2 borrados
  1. 5
    2
      cmPgmOpts.c

+ 5
- 2
cmPgmOpts.c Ver fichero

@@ -722,7 +722,10 @@ cmPoRC_t cmPgmOptParse( cmPgmOptH_t h, unsigned argCnt,  char* argArray[] )
722 722
     cmPgmOptInstallBool(h, kVersionPoId,   'v', "version", 0, false, NULL,0,"Print version information." );
723 723
 
724 724
   if( _cmPgmOptNumIdToOptRecd(p,kPrintParmsPoId) == NULL )
725
-    cmPgmOptInstallBool(h, kPrintParmsPoId,'p', "parms",   0, false, NULL,0,"Print the arguments."); 
725
+    cmPgmOptInstallBool(h, kPrintParmsPoId,'p', "parms",   0, false, NULL,0,"Print the arguments.");
726
+
727
+  if((rc = cmErrLastRC(&p->err)) != kOkPoRC )    
728
+    return rc;
726 729
 
727 730
   
728 731
   while(i<argCnt)
@@ -1247,7 +1250,7 @@ void cmPgmOptPrintHelp( cmPgmOptH_t h, cmRpt_t* rpt )
1247 1250
     if( _cmPoOptUsesValue(r) ) 
1248 1251
       valueTypeLabel = _cmPoTypeFlagToLabel(r->sflags & kTypeMaskPoFl,r->cflags);
1249 1252
 
1250
-    if( cmIsNotFlag(r->sflags,kEnumPoFl)  && cmIsFlag(r->sflags,kReqPoFl) )
1253
+    if( cmIsNotFlag(r->sflags,kEnumPoFl)  && cmIsFlag(r->cflags,kReqPoFl) )
1251 1254
       reqLabel = reqStr;
1252 1255
 
1253 1256
     if( mstr != NULL )

Loading…
Cancelar
Guardar