From 611c198197e9091e6e343ea79ec9d2d617536dd1 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 8 Feb 2024 10:55:48 -0500 Subject: [PATCH] cwCommon.h,cwCsv.h,cwObject.h,cwUi.cpp : Changed result code kLabelNotFoundRC to kEleNotFoundRC. --- cwCommon.h | 2 +- cwCsv.cpp | 2 +- cwObject.h | 4 ++-- cwUi.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cwCommon.h b/cwCommon.h index 67974db..9ab90f8 100644 --- a/cwCommon.h +++ b/cwCommon.h @@ -38,7 +38,7 @@ namespace cw kOpFailRC, // 19 kSyntaxErrorRC, // 20 kBufTooSmallRC, // 21 - kLabelNotFoundRC, // 22 - use by cwObject to indicate that an optional value does not exist. + kEleNotFoundRC, // 22 - use by cwObject to indicate that an optional value does not exist. kDuplicateRC, // 23 - an invalid duplicate was detected kAssertFailRC, // 24 - used with cwLogFatal kInvalidDataTypeRC, // 25 diff --git a/cwCsv.cpp b/cwCsv.cpp index 24c5e39..dff0ae8 100644 --- a/cwCsv.cpp +++ b/cwCsv.cpp @@ -237,7 +237,7 @@ namespace cw for(unsigned i=0; ivalue(v); @@ -226,7 +226,7 @@ namespace cw rc_t rc = get(label,valRef,flags); // if no error occurred .... - if( rc == kOkRC || (rc == kLabelNotFoundRC && cwIsFlag(flags,kOptionalFl))) + if( rc == kOkRC || (rc == kEleNotFoundRC && cwIsFlag(flags,kOptionalFl))) rc = _getv(flags, std::forward(args)...); // ... recurse to find next label/value pair else rc = cwLogError(rc,"Object parse failed for the pair label:'%s'.",cwStringNullGuard(label)); diff --git a/cwUi.cpp b/cwUi.cpp index 75d1618..bf5eb22 100644 --- a/cwUi.cpp +++ b/cwUi.cpp @@ -697,7 +697,7 @@ namespace cw if((rc = o->get("name",eleName, cw::kOptionalFl)) != kOkRC ) { // div's and titles don't need a 'name' - if( rc == kLabelNotFoundRC && (divAliasFl || textCompare(eleType,"label")==0) ) + if( rc == kEleNotFoundRC && (divAliasFl || textCompare(eleType,"label")==0) ) rc = kOkRC; else { @@ -2225,7 +2225,7 @@ cw::rc_t cw::ui::ws::parseArgs( const object_t& o, args_t& args, const char* ob op = &o; else if((op = o.find(object_label)) == nullptr ) - return cwLogError(kLabelNotFoundRC,"The ui configuration label '%s' was not found.", cwStringNullGuard(object_label)); + return cwLogError(kEleNotFoundRC,"The ui configuration label '%s' was not found.", cwStringNullGuard(object_label)); if((rc = op->getv( "physRootDir", args.physRootDir,