Changeset 142 for trunk


Ignore:
Timestamp:
Jan 21, 2024, 10:17:50 PM (22 months ago)
Author:
gyoung
Message:

Fix warnings and error found by C++Check

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/classes/mm-progs/mmfind/mmfind.c

    r126 r142  
    315315
    316316  if(bIsMidi)
    317     strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
     317    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
    318318  else
    319     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
     319    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1);
    320320
    321321  /* Start audio file */

  • trunk/classes/mm-progs/videoplayer/mmplayer.c

    r108 r142  
    159159
    160160/* Track to play. Full path */
    161 char chrSourceName[CCHMAXPATH]={0};
     161char chrSourceName[CCHMAXPATH + 1]={0};
    162162char * chrPtrName=NULLHANDLE; /* Pointer to filename */
    163163char chrClassName[100]= {0};

  • trunk/classes/mm-progs/videoplayer/playaudio.c

    r57 r142  
    158158    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
    159159#endif
    160   strncpy(chrDevice,"DIGITALVIDEO02", sizeof(chrDevice));
     160  strncpy(chrDevice,"DIGITALVIDEO02", sizeof(chrDevice) - 1);
    161161  //  strncpy(chrDevice,"xine", sizeof(chrDevice));
    162162  hwndNotify=hwndFrame;//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);

  • trunk/classes/mm-progs/videoplayer/vioplayer.c

    r2 r142  
    231231  /* Save source name */
    232232  if(argc==2)
    233     strcpy(chrSourceName, argv[1]);
     233    strncpy(chrSourceName, argv[1], CCHMAXPATH);
    234234  printf("File: %s\n", chrSourceName);
    235235

  • trunk/mediafolder/c/cddb/pmcddb.cpp

    r127 r142  
    341341
    342342  for(b=0;b<NUMSERVERS;b++) {/* Query the whole list of servers if necessary */
    343     strncpy(host,cddbServer[b],sizeof(host));
     343    strncpy(host,cddbServer[b],sizeof(host) - 1);
    344344    chrPtr=strrchr(host,':');
    345345    if(chrPtr) {

  • trunk/mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp

    r62 r142  
    457457    // }
    458458
    459   strncpy(chrDevice,"CDAUDIO", sizeof(chrDevice));
     459  strncpy(chrDevice,"CDAUDIO", sizeof(chrDevice) - 1);
    460460
    461461  PSZ pszObjectID;

  • trunk/mediafolder/c/createcd/createcd.c

    r108 r142  
    323323
    324324  if(!getMessage(nameTemplate, /* IDSTR_LAUNCHPADFLYOVER */ IDSTR_CDFOLDERNAME, sizeof(nameTemplate), hmodRes))
    325     strncpy(nameTemplate, "CD-Audio player^Drive %c:", sizeof(nameTemplate));
     325    strncpy(nameTemplate, "CD-Audio player^Drive %c:", sizeof(nameTemplate) - 1);
    326326
    327327  if(!loadLVMFuncs()) {

  • trunk/mediafolder/c/mediafldr/mediafolder.cpp

    r133 r142  
    768768
    769769  if(contentObject->somIsA(mmMIDIClass))
    770     strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
     770    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
    771771  else /*if(contentObject->somIsA(cwAudioClass) || contentObject->somIsA(mmAudioClass))*/
    772772    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
    … …  
    10801080
    10811081  if(contentObject->somIsA(mmMIDIClass))
    1082     strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
     1082    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
    10831083  else /*if(contentObject->somIsA(cwAudioClass) || contentObject->somIsA(mmAudioClass))*/
    10841084    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
Note: See TracChangeset for help on using the changeset viewer.