Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated printf to use %lu instead of %u for all uint32_t 

Addresses warnings in main library as a result of Espressif now including --Wformat warnings during compilation.  No impact on any functionality - these warnings were not meaningful in any case.
This commit is contained in:
Gregg 2024-07-14 10:01:09 -05:00
parent 0e04051ab7
commit 6e9279db60
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/HAP.cpp
View File

@ -1043,7 +1043,7 @@ int HAPClient::putPrepareURL(char *json){
uint64_t pid; uint64_t pid;
if((cBuf=strstr(json,ttlToken))) if((cBuf=strstr(json,ttlToken)))
sscanf(cBuf+strlen(ttlToken),"%u",&ttl); sscanf(cBuf+strlen(ttlToken),"%lu",&ttl);
if((cBuf=strstr(json,pidToken))) if((cBuf=strstr(json,pidToken)))
sscanf(cBuf+strlen(ttlToken),"%llu",&pid); sscanf(cBuf+strlen(ttlToken),"%llu",&pid);
@ -1233,7 +1233,7 @@ void HAPClient::checkTimedWrites(){
auto tw=homeSpan.TimedWrites.begin(); auto tw=homeSpan.TimedWrites.begin();
while(tw!=homeSpan.TimedWrites.end()){ while(tw!=homeSpan.TimedWrites.end()){
if(cTime>tw->second){ // timer has expired if(cTime>tw->second){ // timer has expired
LOG2("Removing PID=%llu ALARM=%u\n",tw->first,tw->second); LOG2("Removing PID=%llu ALARM=%lu\n",tw->first,tw->second);
tw=homeSpan.TimedWrites.erase(tw); tw=homeSpan.TimedWrites.erase(tw);
} }
else else

34
src/HomeSpan.cpp
View File

@ -129,7 +129,7 @@ void Span::begin(Category catID, const char *_displayName, const char *_hostName
LOG0("\nHomeSpan Version: %s",HOMESPAN_VERSION); LOG0("\nHomeSpan Version: %s",HOMESPAN_VERSION);
LOG0("\nArduino-ESP Ver.: %s",ARDUINO_ESP_VERSION); LOG0("\nArduino-ESP Ver.: %s",ARDUINO_ESP_VERSION);
LOG0("\nESP-IDF Version: %d.%d.%d",ESP_IDF_VERSION_MAJOR,ESP_IDF_VERSION_MINOR,ESP_IDF_VERSION_PATCH); LOG0("\nESP-IDF Version: %d.%d.%d",ESP_IDF_VERSION_MAJOR,ESP_IDF_VERSION_MINOR,ESP_IDF_VERSION_PATCH);
LOG0("\nESP32 Chip: %s Rev %d %s-core %dMB Flash", ESP.getChipModel(),ESP.getChipRevision(), LOG0("\nESP32 Chip: %s Rev %d %s-core %luMB Flash", ESP.getChipModel(),ESP.getChipRevision(),
ESP.getChipCores()==1?"single":"dual",ESP.getFlashChipSize()/1024/1024); ESP.getChipCores()==1?"single":"dual",ESP.getFlashChipSize()/1024/1024);
#ifdef ARDUINO_VARIANT #ifdef ARDUINO_VARIANT
@ -816,7 +816,7 @@ void Span::processSerialCommand(const char *c){
char pNames[][7]={"PR","PW","EV","AA","TW","HD","WR"}; char pNames[][7]={"PR","PW","EV","AA","TW","HD","WR"};
for(auto acc=Accessories.begin(); acc!=Accessories.end(); acc++){ for(auto acc=Accessories.begin(); acc!=Accessories.end(); acc++){
LOG0("\u27a4 Accessory: AID=%u\n",(*acc)->aid); LOG0("\u27a4 Accessory: AID=%lu\n",(*acc)->aid);
boolean foundInfo=false; boolean foundInfo=false;
if(acc==Accessories.begin() && (*acc)->aid!=1) if(acc==Accessories.begin() && (*acc)->aid!=1)
@ -829,7 +829,7 @@ void Span::processSerialCommand(const char *c){
vector<uint32_t, Mallocator<uint32_t>> iidValues; vector<uint32_t, Mallocator<uint32_t>> iidValues;
for(auto svc=(*acc)->Services.begin(); svc!=(*acc)->Services.end(); svc++){ for(auto svc=(*acc)->Services.begin(); svc!=(*acc)->Services.end(); svc++){
LOG0(" \u279f Service %s: IID=%u, %sUUID=\"%s\"\n",(*svc)->hapName,(*svc)->iid,(*svc)->isCustom?"Custom-":"",(*svc)->type); LOG0(" \u279f Service %s: IID=%lu, %sUUID=\"%s\"\n",(*svc)->hapName,(*svc)->iid,(*svc)->isCustom?"Custom-":"",(*svc)->type);
if(!strcmp((*svc)->type,"3E")){ if(!strcmp((*svc)->type,"3E")){
foundInfo=true; foundInfo=true;
@ -845,7 +845,7 @@ void Span::processSerialCommand(const char *c){
iidValues.push_back((*svc)->iid); iidValues.push_back((*svc)->iid);
for(auto chr=(*svc)->Characteristics.begin(); chr!=(*svc)->Characteristics.end(); chr++){ for(auto chr=(*svc)->Characteristics.begin(); chr!=(*svc)->Characteristics.end(); chr++){
LOG0(" \u21e8 Characteristic %s(%.33s%s): IID=%u, %sUUID=\"%s\", %sPerms=", LOG0(" \u21e8 Characteristic %s(%.33s%s): IID=%lu, %sUUID=\"%s\", %sPerms=",
(*chr)->hapName,(*chr)->uvPrint((*chr)->value).c_str(),strlen((*chr)->uvPrint((*chr)->value).c_str())>33?"...\"":"",(*chr)->iid,(*chr)->isCustom?"Custom-":"",(*chr)->type,(*chr)->perms!=(*chr)->hapChar->perms?"Custom-":""); (*chr)->hapName,(*chr)->uvPrint((*chr)->value).c_str(),strlen((*chr)->uvPrint((*chr)->value).c_str())>33?"...\"":"",(*chr)->iid,(*chr)->isCustom?"Custom-":"",(*chr)->type,(*chr)->perms!=(*chr)->hapChar->perms?"Custom-":"");
int foundPerms=0; int foundPerms=0;
@ -946,7 +946,7 @@ void Span::processSerialCommand(const char *c){
for(int i=0;i<Accessories.size();i++){ // identify all services with over-ridden loop() methods for(int i=0;i<Accessories.size();i++){ // identify all services with over-ridden loop() methods
for(int j=0;j<Accessories[i]->Services.size();j++){ for(int j=0;j<Accessories[i]->Services.size();j++){
SpanService *s=Accessories[i]->Services[j]; SpanService *s=Accessories[i]->Services[j];
LOG0("%-30s %8.8s %10u %3u %6s %4s %6s ",s->hapName,s->type,Accessories[i]->aid,s->iid, LOG0("%-30s %8.8s %10lu %3lu %6s %4s %6s ",s->hapName,s->type,Accessories[i]->aid,s->iid,
(void(*)())(s->*(&SpanService::update))!=(void(*)())(&SpanService::update)?"YES":"NO", (void(*)())(s->*(&SpanService::update))!=(void(*)())(&SpanService::update)?"YES":"NO",
(void(*)())(s->*(&SpanService::loop))!=(void(*)())(&SpanService::loop)?"YES":"NO", (void(*)())(s->*(&SpanService::loop))!=(void(*)())(&SpanService::loop)?"YES":"NO",
(void(*)(int,boolean))(s->*(&SpanService::button))!=(void(*)(int,boolean))(&SpanService::button)?"YES":"NO" (void(*)(int,boolean))(s->*(&SpanService::button))!=(void(*)(int,boolean))(&SpanService::button)?"YES":"NO"
@ -954,7 +954,7 @@ void Span::processSerialCommand(const char *c){
if(s->linkedServices.empty()) if(s->linkedServices.empty())
LOG0("-"); LOG0("-");
for(int k=0;k<s->linkedServices.size();k++){ for(int k=0;k<s->linkedServices.size();k++){
LOG0("%u",s->linkedServices[k]->iid); LOG0("%lu",s->linkedServices[k]->iid);
if(k<s->linkedServices.size()-1) if(k<s->linkedServices.size()-1)
LOG0(","); LOG0(",");
} }
@ -1340,11 +1340,11 @@ int Span::updateCharacteristics(char *buf, SpanBuf *pObj){
t1=NULL; t1=NULL;
char *t3; char *t3;
if(!strcmp(t2,"aid") && (t3=strtok_r(t1,"}[]:, \"\t\n\r",&p2))){ if(!strcmp(t2,"aid") && (t3=strtok_r(t1,"}[]:, \"\t\n\r",&p2))){
sscanf(t3,"%u",&pObj[nObj].aid); sscanf(t3,"%lu",&pObj[nObj].aid);
okay|=1; okay|=1;
} else } else
if(!strcmp(t2,"iid") && (t3=strtok_r(t1,"}[]:, \"\t\n\r",&p2))){ if(!strcmp(t2,"iid") && (t3=strtok_r(t1,"}[]:, \"\t\n\r",&p2))){
sscanf(t3,"%u",&pObj[nObj].iid); sscanf(t3,"%lu",&pObj[nObj].iid);
okay|=2; okay|=2;
} else } else
if(!strcmp(t2,"value") && (t3=strtok_r(t1,"}[]:,\"",&p2))){ if(!strcmp(t2,"value") && (t3=strtok_r(t1,"}[]:,\"",&p2))){
@ -1414,7 +1414,7 @@ int Span::updateCharacteristics(char *buf, SpanBuf *pObj){
if(pObj[j].characteristic->service==pObj[i].characteristic->service){ // if service of this characteristic matches service that was updated if(pObj[j].characteristic->service==pObj[i].characteristic->service){ // if service of this characteristic matches service that was updated
pObj[j].status=status; // save statusCode for this object pObj[j].status=status; // save statusCode for this object
LOG1("Updating aid=%u iid=%u",pObj[j].characteristic->aid,pObj[j].characteristic->iid); LOG1("Updating aid=%lu iid=%lu",pObj[j].characteristic->aid,pObj[j].characteristic->iid);
if(status==StatusCode::OK){ // if status is okay if(status==StatusCode::OK){ // if status is okay
pObj[j].characteristic->uvSet(pObj[j].characteristic->value,pObj[j].characteristic->newValue); // update characteristic value with new value pObj[j].characteristic->uvSet(pObj[j].characteristic->value,pObj[j].characteristic->newValue); // update characteristic value with new value
if(pObj[j].characteristic->nvsKey){ // if storage key found if(pObj[j].characteristic->nvsKey){ // if storage key found
@ -1504,7 +1504,7 @@ boolean Span::printfAttributes(char **ids, int numIDs, int flags){
StatusCode status[numIDs]; StatusCode status[numIDs];
for(int i=0;i<numIDs;i++){ // PASS 1: loop over all ids requested to check status codes - only errors are if characteristic not found, or not readable for(int i=0;i<numIDs;i++){ // PASS 1: loop over all ids requested to check status codes - only errors are if characteristic not found, or not readable
sscanf(ids[i],"%u.%u",&aid,&iid); // parse aid and iid sscanf(ids[i],"%lu.%lu",&aid,&iid); // parse aid and iid
Characteristics[i]=find(aid,iid); // find matching chararacteristic Characteristics[i]=find(aid,iid); // find matching chararacteristic
if(Characteristics[i]){ // if found if(Characteristics[i]){ // if found
@ -1528,7 +1528,7 @@ boolean Span::printfAttributes(char **ids, int numIDs, int flags){
if(Characteristics[i]) // if found if(Characteristics[i]) // if found
Characteristics[i]->printfAttributes(flags); // get JSON attributes for characteristic (may or may not include status=0 attribute) Characteristics[i]->printfAttributes(flags); // get JSON attributes for characteristic (may or may not include status=0 attribute)
else{ // else create JSON status attribute based on requested aid/iid else{ // else create JSON status attribute based on requested aid/iid
sscanf(ids[i],"%u.%u",&aid,&iid); sscanf(ids[i],"%lu.%lu",&aid,&iid);
hapOut << "{\"iid\":" << iid << ",\"aid\":" << aid << ",\"status\":" << (int)status[i] << "}"; hapOut << "{\"iid\":" << iid << ",\"aid\":" << aid << ",\"status\":" << (int)status[i] << "}";
} }
@ -1654,7 +1654,7 @@ SpanAccessory::~SpanAccessory(){
while((*acc)!=this) while((*acc)!=this)
acc++; acc++;
homeSpan.Accessories.erase(acc); homeSpan.Accessories.erase(acc);
LOG1("Deleted Accessory AID=%d\n",aid); LOG1("Deleted Accessory AID=%lu\n",aid);
} }
/////////////////////////////// ///////////////////////////////
@ -1722,7 +1722,7 @@ SpanService::~SpanService(){
} }
} }
LOG1("Deleted Service AID=%u IID=%u\n",accessory->aid,iid); LOG1("Deleted Service AID=%lu IID=%lu\n",accessory->aid,iid);
} }
/////////////////////////////// ///////////////////////////////
@ -1824,7 +1824,7 @@ SpanCharacteristic::~SpanCharacteristic(){
free(newValue.STRING); free(newValue.STRING);
} }
LOG1("Deleted Characteristic AID=%u IID=%u\n",aid,iid); LOG1("Deleted Characteristic AID=%lu IID=%lu\n",aid,iid);
} }
/////////////////////////////// ///////////////////////////////
@ -2126,7 +2126,7 @@ StatusCode SpanCharacteristic::loadUpdate(char *val, char *ev, boolean wr){
if(evFlag && !(perms&EV)) // notification is not supported for characteristic if(evFlag && !(perms&EV)) // notification is not supported for characteristic
return(StatusCode::NotifyNotAllowed); return(StatusCode::NotifyNotAllowed);
LOG1("Notification Request for aid=%u iid=%u: %s\n",aid,iid,evFlag?"true":"false"); LOG1("Notification Request for aid=%lu iid=%lu: %s\n",aid,iid,evFlag?"true":"false");
HAPClient *hc=&(*(homeSpan.currentClient)); HAPClient *hc=&(*(homeSpan.currentClient));
if(evFlag) if(evFlag)
@ -2157,7 +2157,7 @@ StatusCode SpanCharacteristic::loadUpdate(char *val, char *ev, boolean wr){
newValue.INT=0; newValue.INT=0;
else if(!strcmp(val,"true")) else if(!strcmp(val,"true"))
newValue.INT=1; newValue.INT=1;
else if(!sscanf(val,"%d",&newValue.INT)) else if(!sscanf(val,"%ld",&newValue.INT))
return(StatusCode::InvalidValue); return(StatusCode::InvalidValue);
break; break;
@ -2184,7 +2184,7 @@ StatusCode SpanCharacteristic::loadUpdate(char *val, char *ev, boolean wr){
newValue.UINT32=0; newValue.UINT32=0;
else if(!strcmp(val,"true")) else if(!strcmp(val,"true"))
newValue.UINT32=1; newValue.UINT32=1;
else if(!sscanf(val,"%u",&newValue.UINT32)) else if(!sscanf(val,"%lu",&newValue.UINT32))
return(StatusCode::InvalidValue); return(StatusCode::InvalidValue);
break; break;

2
src/HomeSpan.h
View File

@ -622,7 +622,7 @@ class SpanCharacteristic{
nvsKey=(char *)HS_MALLOC(16); nvsKey=(char *)HS_MALLOC(16);
uint16_t t; uint16_t t;
sscanf(type,"%hx",&t); sscanf(type,"%hx",&t);
sprintf(nvsKey,"%04X%08X%03X",t,aid,iid&0xFFF); sprintf(nvsKey,"%04X%08lX%03lX",t,aid,iid&0xFFF);
size_t len; size_t len;
if(format<FORMAT::STRING){ if(format<FORMAT::STRING){

2
src/TLV8.cpp
View File

@ -266,7 +266,7 @@ void TLV8::print(TLV8_itc it1, TLV8_itc it2) const {
if(it1->getLen()==0) if(it1->getLen()==0)
Serial.printf(" [null]"); Serial.printf(" [null]");
else if(it1->getLen()<=4) else if(it1->getLen()<=4)
Serial.printf(" [%u]",it1->getVal()); Serial.printf(" [%lu]",it1->getVal());
else if(it1->getLen()<=8) else if(it1->getLen()<=8)
Serial.printf(" [%llu]",it1->getVal<uint64_t>()); Serial.printf(" [%llu]",it1->getVal<uint64_t>());
Serial.printf("\n"); Serial.printf("\n");