usb: dwc3: debug: purge usage of strcat
PATCH 2/2 usb: dwc3: debug: purge usage of strcat
Hi Felipe,
Quoted 13 lines · Felipe Balbi
Now that buffer size is always passed around, we don't need to rely on strcat anymore.
Signed-off-by Felipe Balbi <[email protected]>--- drivers/usb/dwc3/debug.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)drivers/usb/dwc3/debug.h +0
-0
drivers/usb/dwc3/debug.h static inline const char *dwc3_ep_event_string(char *str, size_t size, · line 549
Quoted 5 lines
drivers/usb/dwc3/debug.h +2
-0@@ -545,21 +545,25 @@ static inline const char *dwc3_ep_event_string(char *str, size_t size, status &DEPEVT_STATUS_TRANSFER_ACTIVE ? " (Active)" : " (Not Active)"); + len =strlen (str); +
I don't see 'len' used after this. Did you mean to s/ret/len/ in the snprintf() calls below?
Alternatively couldn't you just use 'ret' as an accumulator each time snprintf() is called to keep count of the bytes written to the buffer instead of needing to call strlen() [O(n) each time] multiple times?
Thanks,
Jack
Quoted 39 lines
drivers/usb/dwc3/debug.h +7
-5/* Control Endpoints */ if (epnum <=1 ) {int phase =DEPEVT_STATUS_CONTROL_PHASE (event->status);switch (phase) {case DEPEVT_STATUS_CONTROL_DATA : -strcat (str," [Data Phase]" ); +snprintf (str + ret, size - ret, +" [Data Phase]" );break ;case DEPEVT_STATUS_CONTROL_STATUS : -strcat (str," [Status Phase]" ); +snprintf (str + ret, size - ret, +" [Status Phase]" ); } }break ;case DWC3_DEPEVT_RXTXFIFOEVT : -strcat (str,"FIFO" ); +snprintf (str + ret, size - ret,"FIFO" );break ;case DWC3_DEPEVT_STREAMEVT : status = event->status;@@ -571,13 +575,13 @@ static inline const char *dwc3_ep_event_string(char *str, size_t size,break ;case DEPEVT_STREAMEVT_NOTFOUND :default : -strcat (str," Stream Not Found" ); +snprintf (str + ret, size - ret," Stream Not Found" );break ; }break ;case DWC3_DEPEVT_EPCMDCMPLT : -strcat (str,"Endpoint Command Complete" ); +snprintf (str + ret, size - ret,"Endpoint Command Complete" );break ;default :snprintf (str, size,"UNKNOWN" );