Changeset 1505 for trunk/dll/init.c


Ignore:
Timestamp:
Apr 12, 2010, 12:29:56 AM (15 years ago)
Author:
Gregg Young
Message:

Remove unnecessary type casts; minor formating cleanup.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/init.c

    r1498 r1505  
    474474                DosFindClose(hdir);
    475475                PrfWriteProfileString(fmprof,
    476                                       (CHAR *) FM3Str, "SwapperDat", SwapperDat);
     476                                      FM3Str, "SwapperDat", SwapperDat);
    477477              }
    478478              else
    … …  
    499499    RGBGREY.bRed = RGBGREY.bGreen = RGBGREY.bBlue = (BYTE)204;
    500500    RGBGREY.fcOptions = 0;
    501     FM3UL = *(ULONG *)(CHAR *) FM3Str;
     501    FM3UL = *(ULONG *) FM3Str;
    502502    break;
    503503  case 1:
    … …  
    688688  /* give default appname if none set by caller */
    689689  if (!*appname)
    690     strcpy(appname, (CHAR *) FM3Str);
     690    strcpy(appname, FM3Str);
    691691  /* save appname; may be reset below */
    692692  strcpy(realappname, appname);
    693   if (!strcmp(appname, (CHAR *) FM3Str))
     693  if (!strcmp(appname, FM3Str))
    694694    DosSetMaxFH(100);
    695695  else if (!strcmp(appname, "VDir") ||
    … …  
    910910
    911911  size = sizeof(BOOL);
    912   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "SeparateParms",
     912  PrfQueryProfileData(fmprof, FM3Str, "SeparateParms",
    913913                      &fSeparateParms, &size);
    914914  size = sizeof(BOOL);
    … …  
    916916                      &fSeparateParmsApp, &size);
    917917  if (!fSeparateParms && !fSeparateParmsApp)
    918     strcpy(appname, (CHAR *) FM3Str);
     918    strcpy(appname, FM3Str);
    919919
    920920  /* start help */
    … …  
    12101210    * Separate paramenters -- Please note that appname should be used in
    12111211    * profile calls for user settings that work and are setable in more than one
    1212     * miniapp; (CHAR *) FM3Str should be used for setting only relavent to FM/2 or that
     1212    * miniapp; FM3Str should be used for setting only relavent to FM/2 or that
    12131213    * aren't user settable; realappname should be used for setting applicable to
    12141214    * one or more miniapp but not to FM/2
    … …  
    12911291  PrfQueryProfileData(fmprof, appname, "ThreadNotes", &fThreadNotes, &size);
    12921292  size = sizeof(BOOL);
    1293   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnpagenums", &prnpagenums, &size);
    1294   size = sizeof(BOOL);
    1295   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnalt", &prnalt, &size);
    1296   size = sizeof(BOOL);
    1297   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnformat", &prnformat, &size);
    1298   size = sizeof(BOOL);
    1299   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnformfeedbefore", &prnformfeedbefore, &size);
    1300   size = sizeof(BOOL);
    1301   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnformfeedafter",&prnformfeedafter, &size);
     1293  PrfQueryProfileData(fmprof, FM3Str, "Prnpagenums", &prnpagenums, &size);
     1294  size = sizeof(BOOL);
     1295  PrfQueryProfileData(fmprof, FM3Str, "Prnalt", &prnalt, &size);
     1296  size = sizeof(BOOL);
     1297  PrfQueryProfileData(fmprof, FM3Str, "Prnformat", &prnformat, &size);
     1298  size = sizeof(BOOL);
     1299  PrfQueryProfileData(fmprof, FM3Str, "Prnformfeedbefore", &prnformfeedbefore, &size);
     1300  size = sizeof(BOOL);
     1301  PrfQueryProfileData(fmprof, FM3Str, "Prnformfeedafter",&prnformfeedafter, &size);
    13021302  size = sizeof(ULONG);
    1303   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prntabspaces", &prntabspaces, &size);
     1303  PrfQueryProfileData(fmprof, FM3Str, "Prntabspaces", &prntabspaces, &size);
    13041304  size = sizeof(ULONG);
    1305   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnwidth", &prnwidth, &size);
     1305  PrfQueryProfileData(fmprof, FM3Str, "Prnwidth", &prnwidth, &size);
    13061306  size = sizeof(ULONG);
    1307   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnlength", &prnlength, &size);
     1307  PrfQueryProfileData(fmprof, FM3Str, "Prnlength", &prnlength, &size);
    13081308  size = sizeof(ULONG);
    1309   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prntmargin", &prntmargin, &size);
     1309  PrfQueryProfileData(fmprof, FM3Str, "Prntmargin", &prntmargin, &size);
    13101310  size = sizeof(ULONG);
    1311   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnbmargin", &prnbmargin, &size);
     1311  PrfQueryProfileData(fmprof, FM3Str, "Prnbmargin", &prnbmargin, &size);
    13121312  size = sizeof(ULONG);
    1313   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnlmargin", &prnlmargin, &size);
     1313  PrfQueryProfileData(fmprof, FM3Str, "Prnlmargin", &prnlmargin, &size);
    13141314  size = sizeof(ULONG);
    1315   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnrmargin", &prnrmargin, &size);
     1315  PrfQueryProfileData(fmprof, FM3Str, "Prnrmargin", &prnrmargin, &size);
    13161316  size = sizeof(ULONG);
    1317   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Prnspacing", &prnspacing, &size);
     1317  PrfQueryProfileData(fmprof, FM3Str, "Prnspacing", &prnspacing, &size);
    13181318  size = sizeof(BOOL);
    13191319  PrfQueryProfileData(fmprof, appname, "NoDead", &fNoDead, &size);
    … …  
    13461346  if (strcmp(realappname, "FM/4")) {
    13471347    size = sizeof(BOOL);
    1348     PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "MoreButtons", &fMoreButtons, &size);
     1348    PrfQueryProfileData(fmprof, FM3Str, "MoreButtons", &fMoreButtons, &size);
    13491349    size = sizeof(BOOL);
    1350     PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Drivebar", &fDrivebar, &size);
     1350    PrfQueryProfileData(fmprof, FM3Str, "Drivebar", &fDrivebar, &size);
    13511351  }
    13521352  size = sizeof(BOOL);
    … …  
    13891389  PrfQueryProfileData(fmprof, appname, "AutoAddAllDirs", &fAutoAddAllDirs, &size);
    13901390  size = sizeof(BOOL);
    1391   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "UserListSwitches", &fUserListSwitches, &size);
     1391  PrfQueryProfileData(fmprof, FM3Str, "UserListSwitches", &fUserListSwitches, &size);
    13921392  size = sizeof(BOOL);
    13931393  PrfQueryProfileData(fmprof, appname, "UseNewViewer", &fUseNewViewer, &size);
    … …  
    13951395  PrfQueryProfileData(fmprof, appname, "DefaultDeletePerm", &fDefaultDeletePerm, &size);
    13961396  size = sizeof(BOOL);
    1397   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "ExternalINIs", &fExternalINIs, &size);
    1398   size = sizeof(BOOL);
    1399   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "ExternalCollector", &fExternalCollector, &size);
    1400   size = sizeof(BOOL);
    1401   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "ExternalArcboxes", &fExternalArcboxes, &size);
    1402   size = sizeof(BOOL);
    1403   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "ExternalViewer", &fExternalViewer, &size);
    1404   size = sizeof(BOOL);
    1405   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "UseQProcStat", &fUseQProcStat, &size);
    1406   size = sizeof(BOOL);
    1407   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "UseQSysState", &fUseQSysState, &size);
     1397  PrfQueryProfileData(fmprof, FM3Str, "ExternalINIs", &fExternalINIs, &size);
     1398  size = sizeof(BOOL);
     1399  PrfQueryProfileData(fmprof, FM3Str, "ExternalCollector", &fExternalCollector, &size);
     1400  size = sizeof(BOOL);
     1401  PrfQueryProfileData(fmprof, FM3Str, "ExternalArcboxes", &fExternalArcboxes, &size);
     1402  size = sizeof(BOOL);
     1403  PrfQueryProfileData(fmprof, FM3Str, "ExternalViewer", &fExternalViewer, &size);
     1404  size = sizeof(BOOL);
     1405  PrfQueryProfileData(fmprof, FM3Str, "UseQProcStat", &fUseQProcStat, &size);
     1406  size = sizeof(BOOL);
     1407  PrfQueryProfileData(fmprof, FM3Str, "UseQSysState", &fUseQSysState, &size);
    14081408  size = sizeof(BOOL);
    14091409  PrfQueryProfileData(fmprof, appname, "DataMin", &fDataMin, &size);
    … …  
    14151415  PrfQueryProfileData(fmprof, appname, "DataInclRemote", &fDataInclRemote, &size);
    14161416  size = sizeof(BOOL);
    1417   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "SplitStatus", &fSplitStatus, &size);
     1417  PrfQueryProfileData(fmprof, FM3Str, "SplitStatus", &fSplitStatus, &size);
    14181418  size = sizeof(BOOL);
    14191419  PrfQueryProfileData(fmprof, appname, "FolderAfterExtract", &fFolderAfterExtract, &size);
    … …  
    14251425  PrfQueryProfileData(fmprof, appname, "ConfirmDelete", &fConfirmDelete, &size);
    14261426  size = sizeof(BOOL);
    1427   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "SaveState", &fSaveState, &size);
     1427  PrfQueryProfileData(fmprof, FM3Str, "SaveState", &fSaveState, &size);
    14281428  size = sizeof(BOOL);
    14291429  PrfQueryProfileData(fmprof, appname, "SyncUpdates", &fSyncUpdates, &size);
    … …  
    14331433  PrfQueryProfileData(fmprof, appname, "UnHilite", &fUnHilite, &size);
    14341434  size = sizeof(BOOL);
    1435   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "TileBackwards", &fTileBackwards, &size);
     1435  PrfQueryProfileData(fmprof, FM3Str, "TileBackwards", &fTileBackwards, &size);
    14361436  size = sizeof(BOOL);
    14371437  PrfQueryProfileData(fmprof, appname, "LoadLongname", &fLoadLongnames, &size);
    … …  
    15171517  PrfQueryProfileData(fmprof, appname, "NoTreeGap", &fNoTreeGap, &size);
    15181518  size = sizeof(BOOL);
    1519   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS, &size);
     1519  PrfQueryProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS, &size);
    15201520  size = sizeof(BOOL);
    15211521  PrfQueryProfileData(fmprof, appname, "RemoteBug", &fRemoteBug, &size);
    … …  
    15391539  PrfQueryProfileData(fmprof, appname, "Drag&DropDlg", &fDragndropDlg, &size);
    15401540  size = sizeof(BOOL);
    1541   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "UserComboBox", &fUserComboBox, &size);
    1542   size = sizeof(BOOL);
    1543   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "MinDirOnOpen", &fMinOnOpen, &size);
     1541  PrfQueryProfileData(fmprof, FM3Str, "UserComboBox", &fUserComboBox, &size);
     1542  size = sizeof(BOOL);
     1543  PrfQueryProfileData(fmprof, FM3Str, "MinDirOnOpen", &fMinOnOpen, &size);
    15441544  size = sizeof(BOOL);
    15451545  PrfQueryProfileData(fmprof, appname, "QuickArcFind", &fQuickArcFind, &size);
    … …  
    15471547  PrfQueryProfileData(fmprof, appname, "NoRemovableScan", &fNoRemovableScan, &size);
    15481548  size = sizeof(ULONG);
    1549   PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "NoBrokenNotify", &NoBrokenNotify, &size);
     1549  PrfQueryProfileData(fmprof, FM3Str, "NoBrokenNotify", &NoBrokenNotify, &size);
    15501550  size = sizeof(ULONG);
    15511551  PrfQueryProfileData(fmprof, appname, "ContainerType", &ulCnrType, &size);
Note: See TracChangeset for help on using the changeset viewer.