Changeset 1402 for trunk/dll/droplist.c


Ignore:
Timestamp:
Mar 14, 2009, 6:17:59 PM (16 years ago)
Author:
Gregg Young
Message:

Remove variable aurgs from docopy & unlinkf (not used); Move more strings to PCSZs and string table; Move PCSZs to compile time initialization; Fix hang on startup caused by a drive scan and a dircnr scan trying to update a drive in the tree at the same time (related to the "treeswitch options); Code cleanup mainly removal of old printfs, SayMsgs, DbgMsg and unneeded %s.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/droplist.c

    r1398 r1402  
    2121  02 Aug 07 SHL Lock in DoFileDrop sanity checks
    2222  20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
     23  08 Mar 09 GKY Additional strings move to PCSZs
    2324
    2425***********************************************************************/
     
    5960          if (!DrgAccessDraginfo(pDInfo)) {
    6061            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    61                       "DrgAccessDraginfo");
     62                      PCSZ_DRGACCESSDRAGINFO);
    6263            return FALSE;
    6364          }
     
    155156    len = DrgQueryStrName(pDItem->hstrSourceName,
    156157                          buflen - blen, buffer + blen);
    157     if(!len) {
    158       // DbgMsg(pszSrcFile, __LINE__, "0x%x %d %d", pDItem->hstrSourceName,
    159       //           buflen - blen, buffer + blen);
    160       // Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    161       //         "DrgQueryStrName");
    162     }
    163158    buffer[blen + len] = 0;
    164159    {                                   /* be sure we get full pathname of file/directory */
     
    202197    if (!DrgAccessDraginfo(pDInfo)) {
    203198      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    204                 "DrgAccessDraginfo");
     199                PCSZ_DRGACCESSDRAGINFO);
    205200    }
    206201    else {
     
    237232    if (!DrgAccessDraginfo(pDInfo)) {
    238233      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    239                 "DrgAccessDraginfo");
     234                PCSZ_DRGACCESSDRAGINFO);
    240235    }
    241236    else {
     
    261256    if (!DrgAccessDraginfo(pDInfo)) {
    262257      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    263               "DrgAccessDraginfo");
     258                PCSZ_DRGACCESSDRAGINFO);
    264259      numitems = 0;                     // Oh well
    265260    }
     
    312307  if (!DrgAccessDraginfo(pDInfo)) {
    313308    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    314             "DrgAccessDraginfo");
     309              PCSZ_DRGACCESSDRAGINFO);
    315310    numitems = 0;                       // Avoid death
    316311  }
Note: See TracChangeset for help on using the changeset viewer.