Changeset 108 for trunk/src/helpers/stringh.c

Timestamp:

Oct 13, 2001, 7:57:58 PM (24 years ago)

Author:

umoeller

Message:

Lots of updates from the last week for conditional compiles and other stuff.

File:

• trunk/src/helpers/stringh.c (modified) (1 diff)

trunk/src/helpers/stringh.c

@@ -651 +651 @@
     }
     return (ulWords);
-}
-
-/*
- *@@ strhThousandsULong:
- *      converts a ULONG into a decimal string, while
- *      inserting thousands separators into it. Specify
- *      the separator character in cThousands.
- *
- *      Returns pszTarget so you can use it directly
- *      with sprintf and the "%s" flag.
- *
- *      For cThousands, you should use the data in
- *      OS2.INI ("PM_National" application), which is
- *      always set according to the "Country" object.
- *      You can use prfhQueryCountrySettings to
- *      retrieve this setting.
- *
- *      Use strhThousandsDouble for "double" values.
- */
-
-PSZ strhThousandsULong(PSZ pszTarget,       // out: decimal as string
-                       ULONG ul,            // in: decimal to convert
-                       CHAR cThousands)     // in: separator char (e.g. '.')
-{
-    USHORT ust, uss, usc;
-    CHAR   szTemp[40];
-    sprintf(szTemp, "%lu", ul);
-
-    ust = 0;
-    usc = strlen(szTemp);
-    for (uss = 0; uss < usc; uss++)
-    {
-        if (uss)
-            if (((usc - uss) % 3) == 0)
-            {
-                pszTarget[ust] = cThousands;
-                ust++;
-            }
-        pszTarget[ust] = szTemp[uss];
-        ust++;
-    }
-    pszTarget[ust] = '\0';
-
-    return (pszTarget);
-}
-
-/*
- *@@ strhThousandsDouble:
- *      like strhThousandsULong, but for a "double"
- *      value. Note that after-comma values are truncated.
- */
-
-PSZ strhThousandsDouble(PSZ pszTarget, double dbl, CHAR cThousands)
-{
-    USHORT ust, uss, usc;
-    CHAR   szTemp[40];
-    sprintf(szTemp, "%.0f", floor(dbl));
-
-    ust = 0;
-    usc = strlen(szTemp);
-    for (uss = 0; uss < usc; uss++)
-    {
-        if (uss)
-            if (((usc - uss) % 3) == 0)
-            {
-                pszTarget[ust] = cThousands;
-                ust++;
-            }
-        pszTarget[ust] = szTemp[uss];
-        ust++;
-    }
-    pszTarget[ust] = '\0';
-
-    return (pszTarget);
-}
-
-/*
- *@@ strhVariableDouble:
- *      like strhThousandsULong, but for a "double" value, and
- *      with a variable number of decimal places depending on the
- *      size of the quantity.
- *
- *@@added V0.9.6 (2000-11-12) [pr]
- */
-
-PSZ strhVariableDouble(PSZ pszTarget,
-                       double dbl,
-                       PSZ pszUnits,
-                       CHAR cThousands)
-{
-    if (dbl < 100.0)
-        sprintf(pszTarget, "%.2f%s", dbl, pszUnits);
-    else
-        if (dbl < 1000.0)
-            sprintf(pszTarget, "%.1f%s", dbl, pszUnits);
-        else
-            strcat(strhThousandsDouble(pszTarget, dbl, cThousands),
-                   pszUnits);
-
-    return(pszTarget);
-}
-
-/*
- *@@ strhFileDate:
- *      converts file date data to a string (to pszBuf).
- *      You can pass any FDATE structure to this function,
- *      which are returned in those FILEFINDBUF* or
- *      FILESTATUS* structs by the Dos* functions.
- *
- *      ulDateFormat is the PM setting for the date format,
- *      as set in the "Country" object, and can be queried using
- +              PrfQueryProfileInt(HINI_USER, "PM_National", "iDate", 0);
- *
- *      meaning:
- *      --  0   mm.dd.yyyy  (English)
- *      --  1   dd.mm.yyyy  (e.g. German)
- *      --  2   yyyy.mm.dd  (Japanese, ISO)
- *      --  3   yyyy.dd.mm
- *
- *      cDateSep is used as a date separator (e.g. '.').
- *      This can be queried using:
- +          prfhQueryProfileChar(HINI_USER, "PM_National", "sDate", '/');
- *
- *      Alternatively, you can query all the country settings
- *      at once using prfhQueryCountrySettings (prfh.c).
- *
- *@@changed V0.9.0 (99-11-07) [umoeller]: now calling strhDateTime
- */
-
-VOID strhFileDate(PSZ pszBuf,           // out: string returned
-                  FDATE *pfDate,        // in: date information
-                  ULONG ulDateFormat,   // in: date format (0-3)
-                  CHAR cDateSep)        // in: date separator (e.g. '.')
-{
-    DATETIME dt;
-    dt.day = pfDate->day;
-    dt.month = pfDate->month;
-    dt.year = pfDate->year + 1980;
-
-    strhDateTime(pszBuf,
-                 NULL,          // no time
-                 &dt,
-                 ulDateFormat,
-                 cDateSep,
-                 0, 0);         // no time
-}
-
-/*
- *@@ strhFileTime:
- *      converts file time data to a string (to pszBuf).
- *      You can pass any FTIME structure to this function,
- *      which are returned in those FILEFINDBUF* or
- *      FILESTATUS* structs by the Dos* functions.
- *
- *      ulTimeFormat is the PM setting for the time format,
- *      as set in the "Country" object, and can be queried using
- +              PrfQueryProfileInt(HINI_USER, "PM_National", "iTime", 0);
- *      meaning:
- *      --  0   12-hour clock
- *      --  >0  24-hour clock
- *
- *      cDateSep is used as a time separator (e.g. ':').
- *      This can be queried using:
- +              prfhQueryProfileChar(HINI_USER, "PM_National", "sTime", ':');
- *
- *      Alternatively, you can query all the country settings
- *      at once using prfhQueryCountrySettings (prfh.c).
- *
- *@@changed V0.8.5 (99-03-15) [umoeller]: fixed 12-hour crash
- *@@changed V0.9.0 (99-11-07) [umoeller]: now calling strhDateTime
- */
-
-VOID strhFileTime(PSZ pszBuf,           // out: string returned
-                  FTIME *pfTime,        // in: time information
-                  ULONG ulTimeFormat,   // in: 24-hour time format (0 or 1)
-                  CHAR cTimeSep)        // in: time separator (e.g. ':')
-{
-    DATETIME dt;
-    dt.hours = pfTime->hours;
-    dt.minutes = pfTime->minutes;
-    dt.seconds = pfTime->twosecs * 2;
-
-    strhDateTime(NULL,          // no date
-                 pszBuf,
-                 &dt,
-                 0, 0,          // no date
-                 ulTimeFormat,
-                 cTimeSep);
-}
-
-/*
- *@@ strhDateTime:
- *      converts Control Program DATETIME info
- *      into two strings. See strhFileDate and strhFileTime
- *      for more detailed parameter descriptions.
- *
- *@@added V0.9.0 (99-11-07) [umoeller]
- */
-
-VOID strhDateTime(PSZ pszDate,          // out: date string returned (can be NULL)
-                  PSZ pszTime,          // out: time string returned (can be NULL)
-                  DATETIME *pDateTime,  // in: date/time information
-                  ULONG ulDateFormat,   // in: date format (0-3); see strhFileDate
-                  CHAR cDateSep,        // in: date separator (e.g. '.')
-                  ULONG ulTimeFormat,   // in: 24-hour time format (0 or 1); see strhFileTime
-                  CHAR cTimeSep)        // in: time separator (e.g. ':')
-{
-    if (pszDate)
-    {
-        switch (ulDateFormat)
-        {
-            case 0:  // mm.dd.yyyy  (English)
-                sprintf(pszDate, "%02d%c%02d%c%04d",
-                    pDateTime->month,
-                        cDateSep,
-                    pDateTime->day,
-                        cDateSep,
-                    pDateTime->year);
-            break;
-
-            case 1:  // dd.mm.yyyy  (e.g. German)
-                sprintf(pszDate, "%02d%c%02d%c%04d",
-                    pDateTime->day,
-                        cDateSep,
-                    pDateTime->month,
-                        cDateSep,
-                    pDateTime->year);
-            break;
-
-            case 2: // yyyy.mm.dd  (Japanese)
-                sprintf(pszDate, "%04d%c%02d%c%02d",
-                    pDateTime->year,
-                        cDateSep,
-                    pDateTime->month,
-                        cDateSep,
-                    pDateTime->day);
-            break;
-
-            default: // yyyy.dd.mm
-                sprintf(pszDate, "%04d%c%02d%c%02d",
-                    pDateTime->year,
-                        cDateSep,
-                    pDateTime->day,
-                        cDateSep,
-                    pDateTime->month);
-            break;
-        }
-    }
-
-    if (pszTime)
-    {
-        if (ulTimeFormat == 0)
-        {
-            // for 12-hour clock, we need additional INI data
-            CHAR szAMPM[10] = "err";
-
-            if (pDateTime->hours > 12)
-            {
-                // > 12h: PM.
-
-                // Note: 12:xx noon is 12 AM, not PM (even though
-                // AM stands for "ante meridiam", but English is just
-                // not logical), so that's handled below.
-
-                PrfQueryProfileString(HINI_USER,
-                    "PM_National",
-                    "s2359",        // key
-                    "PM",           // default
-                    szAMPM, sizeof(szAMPM)-1);
-                sprintf(pszTime, "%02d%c%02d%c%02d %s",
-                    // leave 12 == 12 (not 0)
-                    pDateTime->hours % 12,
-                        cTimeSep,
-                    pDateTime->minutes,
-                        cTimeSep,
-                    pDateTime->seconds,
-                    szAMPM);
-            }
-            else
-            {
-                // <= 12h: AM
-                PrfQueryProfileString(HINI_USER,
-                                      "PM_National",
-                                      "s1159",        // key
-                                      "AM",           // default
-                                      szAMPM, sizeof(szAMPM)-1);
-                sprintf(pszTime, "%02d%c%02d%c%02d %s",
-                    pDateTime->hours,
-                        cTimeSep,
-                    pDateTime->minutes,
-                        cTimeSep,
-                    pDateTime->seconds,
-                    szAMPM);
-            }
-        }
-        else
-            // 24-hour clock
-            sprintf(pszTime, "%02d%c%02d%c%02d",
-                pDateTime->hours,
-                    cTimeSep,
-                pDateTime->minutes,
-                    cTimeSep,
-                pDateTime->seconds);
-    }
 }