Changeset 1159

Timestamp:

09/05/08 23:41:13 (3 months ago)

Author:

jbs

Message:

Ticket 187: Draft 1: Functions only

Location:

trunk/dll

Files:

• autoview.c (modified) (2 diffs)
• codepage.c (modified) (1 diff)
• collect.c (modified) (2 diffs)
• common.c (modified) (1 diff)
• dirs.c (modified) (5 diffs)
• droplist.c (modified) (2 diffs)
• filldir.c (modified) (1 diff)
• misc.c (modified) (76 diffs)
• misc.h (modified) (1 diff)
• viewinf.c (modified) (16 diffs)

trunk/dll/autoview.c

@@ -43 +43 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "autoview.h"
+#include "defview.h"                    // DefaultView
+#include "valid.h"                      // IsBinary
 #include "fm3dll.h"
 
@@ -54 +57 @@
 static CHAR stopflag;
 static CHAR currfile[CCHMAXPATH];
+
+static BOOL PutComments(HWND hwnd, CHAR * filename, CHAR * comments);
+static BOOL WriteEA(HWND hwnd, CHAR * filename, CHAR * eaname, USHORT type,
+             CHAR * data);
 
 BOOL WriteEA(HWND hwnd, CHAR * filename, CHAR * eaname, USHORT type,

trunk/dll/codepage.c

@@ -25 +25 @@
 #include "strutil.h"                    // GetPString
 #include "errutil.h"                    // Runtime_Error
+#include "codepage.h"
 #include "fm3dll.h"
 

trunk/dll/collect.c

@@ -1 @@
-
 /***********************************************************************
 
@@ -83 +82 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "command.h"                    // RunCommand
+#include "worker.h"                     // Action, MassAction
+#include "notify.h"                     // AddNote
+#include "misc.h"                       // AdjustCnrColsForPref, AdjustDetailsSwitches, CnrDirectEdit,
+                                        // LoadDetailsSwitches, OpenEdit, QuickPopup, SayFilter
+                                        // SaySort, SayView, SetCnrCols, SetDetailsSwitches
+                                        // SetSortChecks, SetViewMenu, disable_menuitem
+#include "chklist.h"                    // CenterOverWindow, DropListProc
+#include "collect.h"
+#include "common.h"                     // CommonCnrProc, CommonCreateTextChildren, CommonFrameWndProc
+                                        // CommonTextPaint
+#include "select.h"                     // DeselectAll, HideAll, RemoveAll, SelectAll, SelectList
+#include "dirsize.h"                    // DirSizeProc
+#include "grep2.h"                      // GrepDlgProc
+#include "mainwnd.h"                    // MakeBubble
+#include "objwin.h"                     // MakeObjWin
+#include "saveclip.h"                   // SaveListDlgProc
+#include "findrec.h"                    // ShowCnrRecord
+#include "sortcnr.h"                    // SortCollectorCnr
+#include "seeall.h"                     // StartSeeAll
+#include "update.h"                     // UpdateCnrList, UpdateCnrRecord
 #include "fm3dll.h"
+#include "select.h"                     // InvertAll
 
 #include "fortify.h"

trunk/dll/common.c

@@ -41 +41 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "autoview.h"                   // AutoViewProc
+#include "mainwnd.h"                    // BuildDriveBarButtons, TopWindow
+#include "common.h"
+#include "dirsize.h"                    // DirSizeProc
+#include "info.h"                       // DrvInfoProc, SetDrvProc
+#include "seeall.h"                     // StartSeeAll
 #include "fm3dll.h"
 #include "fortify.h"

trunk/dll/dirs.c

@@ -17 +17 @@
 #include <ctype.h>
 
-#define INCL_LONGLONG                   // dircnrs.h
+#define INCL_LONGLONG                   // dircnrs.h
 
 #include "fm3dll.h"
+#include "dirs.h"
+#include "valid.h"                      // IsValidDir
 
 APIRET save_dir2(CHAR * curdir)
@@ -33 +35 @@
       env = strrchr(curdir, '\\');
       if (env) {
-        *env = 0;
-        if (IsValidDir(curdir))
-          return 0;
+        *env = 0;
+        if (IsValidDir(curdir))
+          return 0;
       }
     }
@@ -50 +52 @@
   *curdir = 0;
   ret = DosQCurDisk(&curdrive, &drivemap);
-  curdirlen = CCHMAXPATH - 4;           /* NOTE!!!!!!!!! */
+  curdirlen = CCHMAXPATH - 4;           /* NOTE!!!!!!!!! */
   ret += DosQCurDir(curdrive, &curdir[3], &curdirlen);
   *curdir = (CHAR) ('@' + (INT) curdrive);
@@ -71 +73 @@
       p = strrchr(path, '\\');
       if (p)
-        *p = 0;
+        *p = 0;
       else {
-        strcpy(path, s);
-        break;
+        strcpy(path, s);
+        break;
       }
     }
@@ -86 +88 @@
     if (!DosQCurDisk(&curdrive, &drivemap)) {
       if ((CHAR) ((CHAR) curdrive + '@') != (CHAR) toupper(*HomePath) &&
-          (CHAR) ((CHAR) curdrive + '@') != (CHAR) toupper(*path))
-        DosChDir("\\");
+          (CHAR) ((CHAR) curdrive + '@') != (CHAR) toupper(*path))
+        DosChDir("\\");
     }
     ret = DosSelectDisk(toupper(*path) - '@');

trunk/dll/droplist.c

@@ -33 +33 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "droplist.h"
 #include "fm3dll.h"
 
@@ -40 +41 @@
 
 static ULONG GetDropCount(HWND hwnd, MPARAM mp1);
+static BOOL TwoDrgNames(PDRAGITEM pDItem, CHAR * buffer1, ULONG buflen1,
+                 char *buffer2, ULONG buflen2);
 
 BOOL CheckPmDrgLimit(PDRAGINFO pDInfo)

trunk/dll/filldir.c

@@ -69 +69 @@
 #include "fortify.h"                    // 06 May 08 SHL
 #include "notebook.h"                   // INI file fields
+#include "flesh.h"                      // FleshEnv, Stubby
+#include "update.h"                     // SelectDriveIcon
 #include "fm3dll.h"
 

trunk/dll/misc.c

@@ -1 @@
-
 /***********************************************************************
 
@@ -42 +41 @@
   29 Feb 08 GKY Use xfree where appropriate
   08 Mar 08 JBS Ticket 230: Replace prefixless INI keys for default directory containers with
-                keys using a "DirCnr." prefix
+                keys using a "DirCnr." prefix
   19 Jun 08 JBS Ticket 239: Fix LoadDetailsSwitches so INI file is read correctly and details
-                switches are set correctly.
+                switches are set correctly.
   11 Jul 08 JBS Ticket 230: Simplified code and eliminated some local variables by incorporating
-                all the details view settings (both the global variables and those in the
-                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+                all the details view settings (both the global variables and those in the
+                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   17 Jul 08 SHL Add GetTidForWindow for Fortify support
   20 Jul 08 GKY Add save/append filename to clipboard.
@@ -59 +58 @@
 #include <ctype.h>
 #include <share.h>
-#include <malloc.h>                     // _heapmin
+#include <malloc.h>                     // _heapmin
 
 #define INCL_DOS
@@ -68 +67 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
-#include "pathutil.h"                   // BldQuotedFileName
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
-#include "command.h"                    // LINKCMDS
+#include "pathutil.h"                   // BldQuotedFileName
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "command.h"                    // LINKCMDS
+#include "cmdline.h"                    // CmdLineDlgProc
+#include "defview.h"                    // QuickView
+#include "copyf.h"                      // WriteLongName
+#include "strips.h"                     // chop_at_crnl
 #include "fm3dll.h"
+#include "fortify.h"
 #include "misc.h"
-#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -81 +84 @@
 
 #ifndef BEGIN_LIBPATH
-#define BEGIN_LIBPATH       1
+#define BEGIN_LIBPATH       1
 #endif
 
 #ifndef END_LIBPATH
-#define END_LIBPATH           2
+#define END_LIBPATH           2
 #endif
 
@@ -101 +104 @@
     if (rc) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosGetInfoBlocks");
+                "DosGetInfoBlocks");
       yes = FALSE;
     }
@@ -112 +115 @@
       // OK for window to be dead - just return FALSE
       yes = WinQueryWindowProcess(hwnd, &pid, &tid) &&
-            pid == ppib->pib_ulpid &&
-            (!chkTid || tid == ptib->tib_ptib2->tib2_ultid);
+            pid == ppib->pib_ulpid &&
+            (!chkTid || tid == ptib->tib_ptib2->tib2_ultid);
     }
     return yes;
@@ -136 +139 @@
     if (rc) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosGetInfoBlocks");
+                "DosGetInfoBlocks");
     }
     else {
@@ -142 +145 @@
       TID tid;
       if (!WinQueryWindowProcess(hwnd, &pid, &tid))
-        Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinQueryWindowProcess failed for %X", hwnd);
+        Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinQueryWindowProcess failed for %X", hwnd);
       else if (pid != ppib->pib_ulpid)
-        Runtime_Error(pszSrcFile, __LINE__, "hwnd %X not created by fm/2", hwnd);
+        Runtime_Error(pszSrcFile, __LINE__, "hwnd %X not created by fm/2", hwnd);
       else
-        ordinal = ptib->tib_ptib2->tib2_ultid;
+        ordinal = ptib->tib_ptib2->tib2_ultid;
     }
     return ordinal;
@@ -165 +168 @@
     if (rc) {
       Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                "DosGetInfoBlocks");
+                "DosGetInfoBlocks");
     }
     else
@@ -272 +275 @@
       WinQueryWindowText(hwnd, CCHMAXPATH, s);
       if (*s) {
-        rcl.xRight -= 3;
-        p = s;
-        GpiQueryTextBox(hps, 3, "...", TXTBOX_COUNT, aptl);
-        len = aptl[TXTBOX_TOPRIGHT].x;
-        do {
-          GpiQueryTextBox(hps, strlen(p), p, TXTBOX_COUNT, aptl);
-          if (aptl[TXTBOX_TOPRIGHT].x > (rcl.xRight - (p != s ? len : 0)))
-            p++;
-          else
-            break;
-        }
-        while (*p);
-        if (*p) {
-          GpiSetMix(hps, FM_OVERPAINT);
-          GpiSetColor(hps, CLR_BLACK);
-          ptl.x = 3;
-          ptl.y = ((rcl.yTop / 2) -
-                   ((aptl[TXTBOX_TOPRIGHT].y +
-                     aptl[TXTBOX_BOTTOMLEFT].y) / 2));
-          GpiMove(hps, &ptl);
-          if (p != s)
-            GpiCharString(hps, 3, "...");
-          GpiCharString(hps, strlen(p), p);
-        }
+        rcl.xRight -= 3;
+        p = s;
+        GpiQueryTextBox(hps, 3, "...", TXTBOX_COUNT, aptl);
+        len = aptl[TXTBOX_TOPRIGHT].x;
+        do {
+          GpiQueryTextBox(hps, strlen(p), p, TXTBOX_COUNT, aptl);
+          if (aptl[TXTBOX_TOPRIGHT].x > (rcl.xRight - (p != s ? len : 0)))
+            p++;
+          else
+            break;
+        }
+        while (*p);
+        if (*p) {
+          GpiSetMix(hps, FM_OVERPAINT);
+          GpiSetColor(hps, CLR_BLACK);
+          ptl.x = 3;
+          ptl.y = ((rcl.yTop / 2) -
+                   ((aptl[TXTBOX_TOPRIGHT].y +
+                     aptl[TXTBOX_BOTTOMLEFT].y) / 2));
+          GpiMove(hps, &ptl);
+          if (p != s)
+            GpiCharString(hps, 3, "...");
+          GpiCharString(hps, strlen(p), p);
+        }
       }
       free(s);
@@ -379 +382 @@
 {
   PFIELDINFO pfi = (PFIELDINFO) WinSendMsg(hwndCnr,
-                                           CM_QUERYDETAILFIELDINFO,
-                                           MPVOID, MPFROMSHORT(CMA_FIRST));
+                                           CM_QUERYDETAILFIELDINFO,
+                                           MPVOID, MPFROMSHORT(CMA_FIRST));
 
   while (pfi) {
     if (!strcmp(pfi->pTitleData, title)) {
       if (toggle) {
-        if (pfi->flData & CFA_INVISIBLE)
-          pfi->flData &= (~CFA_INVISIBLE);
-        else
-          pfi->flData |= CFA_INVISIBLE;
-        return !(pfi->flData & CFA_INVISIBLE);
+        if (pfi->flData & CFA_INVISIBLE)
+          pfi->flData &= (~CFA_INVISIBLE);
+        else
+          pfi->flData |= CFA_INVISIBLE;
+        return !(pfi->flData & CFA_INVISIBLE);
       }
       else {
-        if (visible)
-          pfi->flData &= (~CFA_INVISIBLE);
-        else
-          pfi->flData |= CFA_INVISIBLE;
+        if (visible)
+          pfi->flData &= (~CFA_INVISIBLE);
+        else
+          pfi->flData |= CFA_INVISIBLE;
       }
       return TRUE;
@@ -407 +410 @@
 {
   PFIELDINFO pfi = (PFIELDINFO) WinSendMsg(hwndCnr,
-                                           CM_QUERYDETAILFIELDINFO,
-                                           MPVOID, MPFROMSHORT(CMA_FIRST));
+                                           CM_QUERYDETAILFIELDINFO,
+                                           MPVOID, MPFROMSHORT(CMA_FIRST));
 
   while (pfi) {
     if (!strcmp(pfi->pTitleData, title)) {
       if (toggle) {
-        if (pfi->flData & CFA_FIREADONLY)
-          pfi->flData &= (~CFA_FIREADONLY);
-        else
-          pfi->flData |= CFA_FIREADONLY;
-        return (pfi->flData & CFA_FIREADONLY);
+        if (pfi->flData & CFA_FIREADONLY)
+          pfi->flData &= (~CFA_FIREADONLY);
+        else
+          pfi->flData |= CFA_FIREADONLY;
+        return (pfi->flData & CFA_FIREADONLY);
       }
       else {
-        if (!readonly)
-          pfi->flData &= (~CFA_FIREADONLY);
-        else
-          pfi->flData |= CFA_FIREADONLY;
+        if (!readonly)
+          pfi->flData &= (~CFA_FIREADONLY);
+        else
+          pfi->flData |= CFA_FIREADONLY;
       }
       return TRUE;
@@ -445 +448 @@
   if (x != -1) {
     if (!stricmp(FileSystem, HPFS) ||
-        !stricmp(FileSystem, JFS) ||
-        !stricmp(FileSystem, FAT32) ||
-        !stricmp(FileSystem, RAMFS) ||
-        !stricmp(FileSystem, NDFS32) ||
-        !stricmp(FileSystem, NTFS) ||
-        !stricmp(FileSystem, HPFS386)) {
+        !stricmp(FileSystem, JFS) ||
+        !stricmp(FileSystem, FAT32) ||
+        !stricmp(FileSystem, RAMFS) ||
+        !stricmp(FileSystem, NDFS32) ||
+        !stricmp(FileSystem, NTFS) ||
+        !stricmp(FileSystem, HPFS386)) {
       hasCreateDT = TRUE;
       hasAccessDT = TRUE;
@@ -474 +477 @@
   }
   AdjustCnrColVis(hwndCnr,
-                  GetPString(IDS_LADATE),
-                  pds->detailsladate ? hasAccessDT : FALSE,
-                  FALSE);
+                  GetPString(IDS_LADATE),
+                  pds->detailsladate ? hasAccessDT : FALSE,
+                  FALSE);
   AdjustCnrColVis(hwndCnr,
-                  GetPString(IDS_LATIME),
-                  pds->detailslatime ? hasAccessDT : FALSE,
-                  FALSE);
+                  GetPString(IDS_LATIME),
+                  pds->detailslatime ? hasAccessDT : FALSE,
+                  FALSE);
   AdjustCnrColVis(hwndCnr,
-                  GetPString(IDS_CRDATE),
-                  pds->detailscrdate ? hasCreateDT : FALSE,
-                  FALSE);
+                  GetPString(IDS_CRDATE),
+                  pds->detailscrdate ? hasCreateDT : FALSE,
+                  FALSE);
   AdjustCnrColVis(hwndCnr,
-                  GetPString(IDS_CRTIME),
-                  pds->detailscrtime ? hasCreateDT : FALSE,
-                  FALSE);
+                  GetPString(IDS_CRTIME),
+                  pds->detailscrtime ? hasCreateDT : FALSE,
+                  FALSE);
   AdjustCnrColVis(hwndCnr,
-                  GetPString(IDS_LNAME),
-                  pds->detailslongname ? hasLongNames : FALSE,
-                  FALSE);
+                  GetPString(IDS_LNAME),
+                  pds->detailslongname ? hasLongNames : FALSE,
+                  FALSE);
   WinSendMsg(hwndCnr, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
 }
 
 VOID AdjustCnrColsForPref(HWND hwndCnr, CHAR * directory, DETAILS_SETTINGS * pds,
-                          BOOL compare)
+                          BOOL compare)
 {
 
   AdjustCnrColVis(hwndCnr,
-                  compare ? GetPString(IDS_STATUS) : GetPString(IDS_SUBJ),
-                  pds->detailssubject,
-                  FALSE);
+                  compare ? GetPString(IDS_STATUS) : GetPString(IDS_SUBJ),
+                  pds->detailssubject,
+                  FALSE);
 
   AdjustCnrColVis(hwndCnr, GetPString(IDS_ATTR), pds->detailsattr, FALSE);
@@ -532 +535 @@
 
   pfi = WinSendMsg(hwndCnr, CM_ALLOCDETAILFIELDINFO,
-                   MPFROMLONG(CONTAINER_COLUMNS), NULL);
+                   MPFROMLONG(CONTAINER_COLUMNS), NULL);
 
   if (!pfi) {
@@ -582 +585 @@
       pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
       if (isCompCnr)
-        pfi->flData |= CFA_FIREADONLY;
+        pfi->flData |= CFA_FIREADONLY;
       pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
       pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
-                                  GetPString(IDS_SUBJ);
+                                  GetPString(IDS_SUBJ);
       pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
       pfi->cxWidth = dsDirCnrDefault.SubjectDisplayWidth;
@@ -602 +605 @@
       pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
       if (isCompCnr)
-        pfi->flData |= CFA_FIREADONLY;
+        pfi->flData |= CFA_FIREADONLY;
       pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
       pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
-                                  GetPString(IDS_SUBJ);
+                                  GetPString(IDS_SUBJ);
       pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
       pfi->cxWidth = dsDirCnrDefault.SubjectDisplayWidth;
@@ -697 +700 @@
 
     if (!WinSendMsg(hwndCnr, CM_INSERTDETAILFIELDINFO, MPFROMP(pfiFirst),
-                    MPFROMP(&fii))) {
+                    MPFROMP(&fii))) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_INSERTDETAILFIELDINFO");
       fSuccess = FALSE;
@@ -716 +719 @@
     size = sizeof(LONG);
     PrfQueryProfileData(fmprof,
-                        appname, "CnrSplitBar", &cnri.xVertSplitbar, &size);
+                        appname, "CnrSplitBar", &cnri.xVertSplitbar, &size);
     if (cnri.xVertSplitbar <= 0)
       cnri.xVertSplitbar = DIR_SPLITBAR_OFFSET - 32;
     if (!WinSendMsg(hwndCnr, CM_SETCNRINFO, MPFROMP(&cnri),
-                    MPFROMLONG(CMA_PFIELDINFOLAST | CMA_PFIELDINFOOBJECT |
-                               CMA_XVERTSPLITBAR))) {
+                    MPFROMLONG(CMA_PFIELDINFOLAST | CMA_PFIELDINFOOBJECT |
+                               CMA_XVERTSPLITBAR))) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_SETCNRINFO");
       fSuccess = FALSE;
@@ -739 +742 @@
 
       if (pci &&
-          (INT) pci != -1 &&
-          !IsRoot(pci->pszFileName) &&
-          !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
-        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName)) {
-          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
-        }
-        else if (pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject))
-          PostMsg(hwnd, UM_FIXCNRMLE, MPFROMLONG(1048), MPVOID);
-        else
-          PostMsg(hwnd, UM_FIXCNRMLE, MPFROMLONG(CCHMAXPATH), MPVOID);
+          (INT) pci != -1 &&
+          !IsRoot(pci->pszFileName) &&
+          !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
+        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName)) {
+          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
+        }
+        else if (pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject))
+          PostMsg(hwnd, UM_FIXCNRMLE, MPFROMLONG(1048), MPVOID);
+        else
+          PostMsg(hwnd, UM_FIXCNRMLE, MPFROMLONG(CCHMAXPATH), MPVOID);
       }
       else
-        PostMsg(hwnd, CM_CLOSEEDIT, MPVOID, MPVOID);
+        PostMsg(hwnd, CM_CLOSEEDIT, MPVOID, MPVOID);
     }
     break;
@@ -763 +766 @@
 
       if (pci && (INT) pci != -1 && !IsRoot(pci->pszFileName)) {
-        if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszSubject)) {
-
-          APIRET rc;
-          EAOP2 eaop;
-          PFEA2LIST pfealist = NULL;
-          CHAR szSubject[1048];
-          ULONG ealen;
-          USHORT len;
-          CHAR *eaval;
-          LONG retlen;
-          PSZ psz;
-
-          retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
-          szSubject[retlen + 1] = 0;
-          bstrip(szSubject);
-          if (pci->pszSubject != NullStr) {
-            if (retlen == 0) {
-              psz = pci->pszSubject;
-              pci->pszSubject = NullStr;
-              xfree(psz, pszSrcFile, __LINE__);
-            }
-            else
-              pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
-          }
-          else {
-            pci->pszSubject = xmalloc(retlen + 1, pszSrcFile, __LINE__);
-            if (!pci->pszSubject)
-              return FALSE;
-          }
-          len = strlen(szSubject);
-          if (len)
-