Changeset 108 for trunk/mediafolder/c

Timestamp:

Oct 4, 2023, 6:18:02 PM (23 months ago)

Author:

gyoung

Message:

Fix all the warnings and errors reported by CPPCheck.

Location:

trunk/mediafolder/c

Files:

• cddb/cddbcls.cpp (modified) (3 diffs)
• createcd/createcd.c (modified) (1 diff)
• helper/except.cpp (modified) (4 diffs)
• mediafldr/mediadialogprocs.cpp (modified) (1 diff)

trunk/mediafolder/c/cddb/cddbcls.cpp

@@ -453 +453 @@
   char key[20];
   char trackName[100];
-  int iTrack;
+  ULONG iTrack;
   
   do{
@@ -472 +472 @@
       sscanf(buffer,"%20[^0-9=]",key);
       /* We put track names into a linked list in the cddb instance */
-      if(!strcmp(strupr(key),"TTITLE")) {
+      if(!strcmp(strupr(key),"TITLE")) {
         iTrack=0;
         /* We have a disc title */
-        sscanf(buffer,"%20[^0-9]%d=%100[^\n\r]",key,iTrack,trackName);
+        sscanf(buffer,"%20[^0-9]%lu=%100[^\n\r]",key,iTrack,trackName);
         Cddb->newTrack(trackName,iTrack); /* New track entry in cddb instance */
       }
@@ -483 +483 @@
 }
 
-cddb_read(int s,cddb * Cddb)
+int cddb_read(int s,cddb * Cddb)
 {
   char buffer[512];

trunk/mediafolder/c/createcd/createcd.c

@@ -103 +103 @@
 static BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource)
 {
-  char* pOffset;
-  char* ptr;
+  char* pOffset = 0;
+  char* ptr = 0;
   int id=0;
 

trunk/mediafolder/c/helper/except.cpp

@@ -1655 +1655 @@
                        NrPublic = pubfunc_ofs = sspub32.offset;
                        read_types = TRUE;
-                       sprintf(szNrPub,"%s %s (%s) %04X:%08X\n",
+                       sprintf(szNrPub,"%s %s (%s) %04X:%08lu\n",
                                (sspub32.type==1) ? " Abs" : " ",ename,ModName,
                                sspub32.segment, sspub32.offset
@@ -1901 +1901 @@
 
    if (type == 0)
-      sprintf(value, "%hd", *(signed char *)varptr);
+      sprintf(value, "%hhd", *(signed char *)varptr);
    else if (type == 1)
       sprintf(value, "%hd", *(signed short *)varptr);
@@ -1917 +1917 @@
       sprintf(value, "%f", *(double *)varptr);
    else if (type == 10)
-      sprintf(value, "%f", *(long double *)varptr);
+      sprintf(value, "%Lf", *(long double *)varptr);
    else if (type == 16)
       sprintf(value, "%s", *(char *)varptr ? "TRUE" : "FALSE");
@@ -1927 +1927 @@
       sprintf(value, "%c", *(char *)varptr);
    else if (type == 21)
-      sprintf(value, "%lc", *(short *)varptr);
+      sprintf(value, "%hd", *(short *)varptr);
    else if (type == 22)
       sprintf(value, "%lc", *(long *)varptr);

trunk/mediafolder/c/mediafldr/mediadialogprocs.cpp

@@ -694 +694 @@
                       if(lPos/1000!=lLastPos) {
                         /* Prevent flickering */
-                        sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
+                        sprintf(chrCommand, "%ld:%02ld", lPos/1000/60, (lPos/1000)%60);
                         WinSetWindowText(WinWindowFromID(hwnd, IDST_PLAYTIME), chrCommand);
                         lLastPos=lPos/1000;