mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 338732 - Make nsIDateTimeFormat header frozen-linkage friendly (use nsAString instead of nsString), r=smontagu

This commit is contained in:
benjamin%smedbergs.us 2006-05-22 13:20:59 +00:00
Родитель 0eb22c784c
Коммит 66d8c3ac05
7 изменённых файлов: 33 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
intl/locale/public/nsIDateTimeFormat.h
Просмотреть файл

@ -42,7 +42,7 @@
#include "nsISupports.h" #include "nsISupports.h"
#include "nscore.h" #include "nscore.h"
#include "nsString.h" #include "nsStringGlue.h"
#include "nsILocale.h" #include "nsILocale.h"
#include "nsIScriptableDateFormat.h" #include "nsIScriptableDateFormat.h"
#include "prtime.h" #include "prtime.h"
@ -67,28 +67,28 @@ public:
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut) = 0; nsAString& stringOut) = 0;
// performs a locale sensitive date formatting operation on the struct tm parameter // performs a locale sensitive date formatting operation on the struct tm parameter
NS_IMETHOD FormatTMTime(nsILocale* locale, NS_IMETHOD FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut) = 0; nsAString& stringOut) = 0;
// performs a locale sensitive date formatting operation on the PRTime parameter // performs a locale sensitive date formatting operation on the PRTime parameter
NS_IMETHOD FormatPRTime(nsILocale* locale, NS_IMETHOD FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut) = 0; nsAString& stringOut) = 0;
// performs a locale sensitive date formatting operation on the PRExplodedTime parameter // performs a locale sensitive date formatting operation on the PRExplodedTime parameter
NS_IMETHOD FormatPRExplodedTime(nsILocale* locale, NS_IMETHOD FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut) = 0; nsAString& stringOut) = 0;
}; };
NS_DEFINE_STATIC_IID_ACCESSOR(nsIDateTimeFormat, NS_IDATETIMEFORMAT_IID) NS_DEFINE_STATIC_IID_ACCESSOR(nsIDateTimeFormat, NS_IDATETIMEFORMAT_IID)

13
intl/locale/src/mac/nsDateTimeFormatMac.cpp
Просмотреть файл

@ -321,7 +321,7 @@ nsresult nsDateTimeFormatMac::FormatTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut) nsAString& stringOut)
{ {
return FormatTMTime(locale, dateFormatSelector, timeFormatSelector, localtime(&timetTime), stringOut); return FormatTMTime(locale, dateFormatSelector, timeFormatSelector, localtime(&timetTime), stringOut);
} }
@ -340,7 +340,7 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut) nsAString& stringOut)
{ {
DateTimeRec macDateTime; DateTimeRec macDateTime;
Str255 timeString, dateString; Str255 timeString, dateString;
@ -352,11 +352,12 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
// return, nothing to format // return, nothing to format
if (dateFormatSelector == kDateFormatNone && timeFormatSelector == kTimeFormatNone) { if (dateFormatSelector == kDateFormatNone && timeFormatSelector == kTimeFormatNone) {
stringOut.SetLength(0); stringOut.Truncate();
return NS_OK; return NS_OK;
} }
stringOut.AssignWithConversion(asctime(tmTime)); // set the default string, in case for API/conversion errors // set the default string, in case for API/conversion errors
CopyASCIItoUTF16(nsDependentCString(asctime(tmTime)), stringOut);
// convert struct tm to input format of mac toolbox call // convert struct tm to input format of mac toolbox call
NS_ASSERTION(tmTime->tm_mon >= 0, "tm is not set correctly"); NS_ASSERTION(tmTime->tm_mon >= 0, "tm is not set correctly");
@ -458,7 +459,7 @@ nsresult nsDateTimeFormatMac::FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut) nsAString& stringOut)
{ {
PRExplodedTime explodedTime; PRExplodedTime explodedTime;
PR_ExplodeTime(prTime, PR_LocalTimeParameters, &explodedTime); PR_ExplodeTime(prTime, PR_LocalTimeParameters, &explodedTime);
@ -471,7 +472,7 @@ nsresult nsDateTimeFormatMac::FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut) nsAString& stringOut)
{ {
struct tm tmTime; struct tm tmTime;
memset( &tmTime, 0, sizeof(tmTime) ); memset( &tmTime, 0, sizeof(tmTime) );

8
intl/locale/src/mac/nsDateTimeFormatMac.h
Просмотреть файл

@ -55,27 +55,27 @@ public:
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the struct tm parameter // performs a locale sensitive date formatting operation on the struct tm parameter
NS_IMETHOD FormatTMTime(nsILocale* locale, NS_IMETHOD FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the PRTime parameter // performs a locale sensitive date formatting operation on the PRTime parameter
NS_IMETHOD FormatPRTime(nsILocale* locale, NS_IMETHOD FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the PRExplodedTime parameter // performs a locale sensitive date formatting operation on the PRExplodedTime parameter
NS_IMETHOD FormatPRExplodedTime(nsILocale* locale, NS_IMETHOD FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut); nsAString& stringOut);
nsDateTimeFormatMac() {} nsDateTimeFormatMac() {}

8
intl/locale/src/unix/nsDateTimeFormatUnix.cpp
Просмотреть файл

@ -170,7 +170,7 @@ nsresult nsDateTimeFormatUnix::FormatTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut) nsAString& stringOut)
{ {
struct tm tmTime; struct tm tmTime;
memcpy(&tmTime, localtime(&timetTime), sizeof(struct tm)); memcpy(&tmTime, localtime(&timetTime), sizeof(struct tm));
@ -182,7 +182,7 @@ nsresult nsDateTimeFormatUnix::FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut) nsAString& stringOut)
{ {
#define NSDATETIME_FORMAT_BUFFER_LEN 80 #define NSDATETIME_FORMAT_BUFFER_LEN 80
char strOut[NSDATETIME_FORMAT_BUFFER_LEN*2]; // buffer for date and time char strOut[NSDATETIME_FORMAT_BUFFER_LEN*2]; // buffer for date and time
@ -275,7 +275,7 @@ nsresult nsDateTimeFormatUnix::FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut) nsAString& stringOut)
{ {
PRExplodedTime explodedTime; PRExplodedTime explodedTime;
PR_ExplodeTime(prTime, PR_LocalTimeParameters, &explodedTime); PR_ExplodeTime(prTime, PR_LocalTimeParameters, &explodedTime);
@ -288,7 +288,7 @@ nsresult nsDateTimeFormatUnix::FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut) nsAString& stringOut)
{ {
struct tm tmTime; struct tm tmTime;
/* be safe and set all members of struct tm to zero /* be safe and set all members of struct tm to zero

8
intl/locale/src/unix/nsDateTimeFormatUnix.h
Просмотреть файл

@ -56,28 +56,28 @@ public:
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the struct tm parameter // performs a locale sensitive date formatting operation on the struct tm parameter
NS_IMETHOD FormatTMTime(nsILocale* locale, NS_IMETHOD FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the PRTime parameter // performs a locale sensitive date formatting operation on the PRTime parameter
NS_IMETHOD FormatPRTime(nsILocale* locale, NS_IMETHOD FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the PRExplodedTime parameter // performs a locale sensitive date formatting operation on the PRExplodedTime parameter
NS_IMETHOD FormatPRExplodedTime(nsILocale* locale, NS_IMETHOD FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut); nsAString& stringOut);
nsDateTimeFormatUnix() {mLocale.Truncate();mAppLocale.Truncate();} nsDateTimeFormatUnix() {mLocale.Truncate();mAppLocale.Truncate();}

10
intl/locale/src/windows/nsDateTimeFormatWin.cpp
Просмотреть файл

@ -128,7 +128,7 @@ nsresult nsDateTimeFormatWin::FormatTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut) nsAString& stringOut)
{ {
return FormatTMTime(locale, dateFormatSelector, timeFormatSelector, localtime( &timetTime ), stringOut); return FormatTMTime(locale, dateFormatSelector, timeFormatSelector, localtime( &timetTime ), stringOut);
} }
@ -138,7 +138,7 @@ nsresult nsDateTimeFormatWin::FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut) nsAString& stringOut)
{ {
SYSTEMTIME system_time; SYSTEMTIME system_time;
DWORD dwFlags_Date = 0, dwFlags_Time = 0; DWORD dwFlags_Date = 0, dwFlags_Time = 0;
@ -228,7 +228,7 @@ nsresult nsDateTimeFormatWin::FormatTMTime(nsILocale* locale,
NS_ASSERTION(NSDATETIMEFORMAT_BUFFER_LEN >= (PRUint32) (timeLen + 1), "internal time buffer is not large enough"); NS_ASSERTION(NSDATETIMEFORMAT_BUFFER_LEN >= (PRUint32) (timeLen + 1), "internal time buffer is not large enough");
// Copy the result // Copy the result
stringOut.SetLength(0); stringOut.Truncate();
if (dateLen != 0 && timeLen != 0) { if (dateLen != 0 && timeLen != 0) {
stringOut.Assign(dateBuffer, dateLen); stringOut.Assign(dateBuffer, dateLen);
stringOut.Append((PRUnichar *)(L" "), 1); stringOut.Append((PRUnichar *)(L" "), 1);
@ -249,7 +249,7 @@ nsresult nsDateTimeFormatWin::FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut) nsAString& stringOut)
{ {
PRExplodedTime explodedTime; PRExplodedTime explodedTime;
PR_ExplodeTime(prTime, PR_LocalTimeParameters, &explodedTime); PR_ExplodeTime(prTime, PR_LocalTimeParameters, &explodedTime);
@ -262,7 +262,7 @@ nsresult nsDateTimeFormatWin::FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut) nsAString& stringOut)
{ {
struct tm tmTime; struct tm tmTime;
memset( &tmTime, 0, sizeof(tmTime) ); memset( &tmTime, 0, sizeof(tmTime) );

8
intl/locale/src/windows/nsDateTimeFormatWin.h
Просмотреть файл

@ -56,28 +56,28 @@ public:
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime, const time_t timetTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the struct tm parameter // performs a locale sensitive date formatting operation on the struct tm parameter
NS_IMETHOD FormatTMTime(nsILocale* locale, NS_IMETHOD FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime, const struct tm* tmTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the PRTime parameter // performs a locale sensitive date formatting operation on the PRTime parameter
NS_IMETHOD FormatPRTime(nsILocale* locale, NS_IMETHOD FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime, const PRTime prTime,
nsString& stringOut); nsAString& stringOut);
// performs a locale sensitive date formatting operation on the PRExplodedTime parameter // performs a locale sensitive date formatting operation on the PRExplodedTime parameter
NS_IMETHOD FormatPRExplodedTime(nsILocale* locale, NS_IMETHOD FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector, const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector, const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime, const PRExplodedTime* explodedTime,
nsString& stringOut); nsAString& stringOut);
nsDateTimeFormatWin() {mLocale.SetLength(0);mAppLocale.SetLength(0);} nsDateTimeFormatWin() {mLocale.SetLength(0);mAppLocale.SetLength(0);}