Changeset 1397 for trunk/dll


Ignore:
Timestamp:
Feb 9, 2009, 12:18:29 AM (17 years ago)
Author:
Gregg Young
Message:

Some clean up of the date formatting code

Location:
trunk/dll
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/autoview.c

    r1395 r1397  
    454454
    455455            static FILEFINDBUF4L ffb[130];
    456             CHAR fullname[CCHMAXPATH + 4], szCmmaFmtFileSize[81], szDate[11];
     456            CHAR fullname[CCHMAXPATH + 4], szCmmaFmtFileSize[81], szDate[DATE_BUF_BYTES];
    457457            HDIR hdir = HDIR_CREATE;
    458458            ULONG x, nm, ml, mc, bufflen;

  • trunk/dll/collect.c

    r1395 r1397  
    12681268    if (dcd) {
    12691269      CNRINFO cnri;
    1270       CHAR s[CCHMAXPATH + 69], tb[81], tf[81], szDate[11], *p;
     1270      CHAR s[CCHMAXPATH + 69], tb[81], tf[81], szDate[DATE_BUF_BYTES] *p;
    12711271      PCNRITEM pci = NULL;
    12721272
    … …  
    26752675          PNOTIFYRECORDEMPHASIS pre = mp2;
    26762676          PCNRITEM pci;
    2677           CHAR s[CCHMAXPATH + 91], tb[81], tf[81], szDate[11], *p;
     2677          CHAR s[CCHMAXPATH + 91], tb[81], tf[81], szDate[DATE_BUF_BYTES], *p;
    26782678
    26792679          pci = (PCNRITEM) ((pre) ? pre->pRecord : NULL);

  • trunk/dll/commafmt.c

    r1395 r1397  
    173173}
    174174
    175 VOID DateFormat(PSZ pszBuf, CDATE Date)
     175VOID DateFormat(CHAR szBuf[DATE_BUF_BYTES], CDATE Date)
    176176{
    177177  switch(ulDateFmt) {
    … …  
    179179  case 3:
    180180
    181     sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
     181    sprintf(szBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
    182182            Date.day, DateSeparator, Date.month);
    183183    break;
    … …  
    185185  case 2:
    186186
    187     sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
     187    sprintf(szBuf, "%04u%s%02u%s%02u",  Date.year, DateSeparator,
    188188            Date.month, DateSeparator, Date.day);
    189189    break;
    … …  
    191191  case 1:
    192192
    193     sprintf(pszBuf, "%02u%s%02u%s%04u", Date.day, DateSeparator,
     193    sprintf(szBuf, "%02u%s%02u%s%04u",  Date.day, DateSeparator,
    194194            Date.month, DateSeparator, Date.year);
    195195    break;
    … …  
    198198  default:
    199199
    200     sprintf(pszBuf, "%02u%s%02u%s%04u", Date.month, DateSeparator,
     200    sprintf(szBuf, "%02u%s%02u%s%04u",  Date.month, DateSeparator,
    201201            Date.day, DateSeparator, Date.year);
    202202    break;
    … …  
    204204}
    205205
    206 VOID FDateFormat(PSZ pszBuf, FDATE Date)
     206VOID FDateFormat(CHAR szBuf[DATE_BUF_BYTES], FDATE Date)
    207207{
    208208  switch(ulDateFmt) {
    … …  
    210210  case 3:
    211211
    212     sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year + 1980, DateSeparator,
     212    sprintf(szBuf, "%04u%s%02u%s%02u",  Date.year + 1980, DateSeparator,
    213213            Date.day, DateSeparator, Date.month);
    214214    break;
    … …  
    216216  case 2:
    217217
    218     sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year + 1980, DateSeparator,
     218    sprintf(szBuf, "%04u%s%02u%s%02u",  Date.year + 1980, DateSeparator,
    219219            Date.month, DateSeparator, Date.day);
    220220    break;
    … …  
    222222  case 1:
    223223
    224     sprintf(pszBuf, "%02u%s%02u%s%04u", Date.day, DateSeparator,
     224    sprintf(szBuf, "%02u%s%02u%s%04u",  Date.day, DateSeparator,
    225225            Date.month, DateSeparator, Date.year + 1980);
    226226    break;
    … …  
    229229  default:
    230230
    231     sprintf(pszBuf, "%02u%s%02u%s%04u", Date.month, DateSeparator,
     231    sprintf(szBuf, "%02u%s%02u%s%04u",  Date.month, DateSeparator,
    232232            Date.day, DateSeparator, Date.year + 1980);
    233233    break;
    … …  
    235235}
    236236
    237 VOID DTDateFormat(PSZ pszBuf, DATETIME Date)
     237VOID DTDateFormat(CHAR szBuf[DATE_BUF_BYTES], DATETIME Date)
    238238{
    239239  switch(ulDateFmt) {
    … …  
    241241  case 3:
    242242
    243     sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
     243    sprintf(szBuf, "%04u%s%02u%s%02u",  Date.year, DateSeparator,
    244244            Date.day, DateSeparator, Date.month);
    245245    break;
    … …  
    247247  case 2:
    248248
    249     sprintf(pszBuf, "%04u%s%02u%s%02u", Date.year, DateSeparator,
     249    sprintf(szBuf, "%04u%s%02u%s%02u",  Date.year, DateSeparator,
    250250            Date.month, DateSeparator, Date.day);
    251251    break;
    … …  
    253253  case 1:
    254254
    255     sprintf(pszBuf, "%02u%s%02u%s%04u", Date.day, DateSeparator,
     255    sprintf(szBuf, "%02u%s%02u%s%04u",  Date.day, DateSeparator,
    256256            Date.month, DateSeparator, Date.year);
    257257    break;
    … …  
    260260  default:
    261261
    262     sprintf(pszBuf, "%02u%s%02u%s%04u", Date.month, DateSeparator,
     262    sprintf(szBuf, "%02u%s%02u%s%04u",  Date.month, DateSeparator,
    263263            Date.day, DateSeparator, Date.year);
    264264    break;

  • trunk/dll/commafmt.h

    r1395 r1397  
    1717#define COMMAFMT_H
    1818
     19#define DATE_BUF_BYTES 11
     20
    1921size_t CommaFmtUL(char *pszBuf, UINT cBufSize, ULONG ullNumber,
    2022                  CHAR chPreferred);
    … …  
    2325size_t commafmt(PSZ pszBuf, UINT cBufSize, LONG lNumber);
    2426
    25 VOID DateFormat(PSZ pszBuf, CDATE Date);
     27VOID DateFormat(CHAR szBuf[DATE_BUF_BYTES], CDATE Date);
    2628
    27 VOID FDateFormat(PSZ pszBuf, FDATE Date);
     29VOID FDateFormat(CHAR szBuf[DATE_BUF_BYTES], FDATE Date);
    2830
    29 VOID DTDateFormat(PSZ pszBuf, DATETIME Date);
     31VOID DTDateFormat(CHAR szBuf[DATE_BUF_BYTES], DATETIME Date);
    3032
    3133#endif // COMMAFMT_H

  • trunk/dll/comp.c

    r1395 r1397  
    143143  HDIR hdir = HDIR_CREATE;
    144144  ULONG ulFindCnt;
    145   CHAR  szCmmaFmtFileSize[81], szDate[11];
     145  CHAR  szCmmaFmtFileSize[81], szDate[DATE_BUF_BYTES];
    146146
    147147  // 13 Aug 07 SHL fimxe to use FileToGet

  • trunk/dll/datamin.c

    r1395 r1397  
    750750  case UM_TIMER:
    751751    {
    752       CHAR s[134], szDate[11];
     752      CHAR s[134], szDate[DATE_BUF_BYTES];
    753753      DATETIME dt;
    754754

  • trunk/dll/dircnrs.c

    r1395 r1397  
    14741474
    14751475      CNRINFO cnri;
    1476       CHAR s[CCHMAXPATH * 2], tf[81], tb[81], szDate[11];
     1476      CHAR s[CCHMAXPATH * 2], tf[81], tb[81], szDate[DATE_BUF_BYTES];
    14771477      PCNRITEM pci;
    14781478
    … …  
    33503350                }
    33513351                if (fMoreButtons) {
    3352                   CHAR szDate[11];
     3352                  CHAR szDate[DATE_BUF_BYTES];
    33533353
    33543354                  WinSetWindowText(hwndName, pci->pszFileName);

  • trunk/dll/info.c

    r1395 r1397  
    659659      CHAR s[97];
    660660      CHAR szCmmaFmtFileSize[81], szCmmaFmtEASize[81];
    661       CHAR szCmmaFmtFileEASize[81], szCmmaFmtFileEASizeK[81], szDate[11];
     661      CHAR szCmmaFmtFileEASize[81], szCmmaFmtFileEASizeK[81], szDate[DATE_BUF_BYTES];
    662662      FILEFINDBUF4L fs;
    663663      HDIR hdir = HDIR_CREATE;

  • trunk/dll/rename.c

    r1395 r1397  
    8888
    8989        FILESTATUS3L fs1, fs2;
    90         CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81], szDate[11];
     90        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81], szDate[DATE_BUF_BYTES];
    9191        INT sourceexists = 0, targetexists = 0,
    9292            sourcenewer = 0, sourcesmaller = 0;

  • trunk/dll/saveclip.c

    r1395 r1397  
    514514                    case 'D':
    515515                      {
    516                         CHAR szDate[11];
     516                        CHAR szDate[DATE_BUF_BYTES];
    517517
    518518                        DateFormat(szDate, pci->date);
    … …  
    959959                    case 'D':
    960960                      {
    961                         CHAR szDate[11];
     961                        CHAR szDate[DATE_BUF_BYTES];
    962962
    963963                        FDateFormat(szDate, ffb4.fdateLastWrite);

  • trunk/dll/seeall.c

    r1395 r1397  
    23272327  ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
    23282328  POINTL ptl;
    2329   CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[11];
     2329  CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[DATE_BUF_BYTES];
    23302330  ULONG len, y;
    23312331
    … …  
    34593459      register ULONG x;
    34603460      ULONG y, len, numlines;
    3461       CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[11];
     3461      CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81], szDate[DATE_BUF_BYTES];
    34623462      BOOL inverted, hidsys, reado, wascursored;
    34633463

  • trunk/dll/treecnr.c

    r1395 r1397  
    12241224                                           MAIN_STATUS), pci->pszFileName);
    12251225        if (fMoreButtons && hwndName) {
    1226           CHAR szDate[11];
     1226          CHAR szDate[DATE_BUF_BYTES];
    12271227
    12281228          DateFormat(szDate, pci->date);
Note: See TracChangeset for help on using the changeset viewer.