mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 00:30:53 +00:00
Minor bugfixes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3478 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
10a58e5050
commit
94b16e9c18
3 changed files with 24 additions and 4 deletions
|
@ -819,8 +819,11 @@
|
|||
else
|
||||
months = [locale objectForKey: NSMonthNameArray];
|
||||
name = [months objectAtIndex: md-1];
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s",
|
||||
if (name)
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s",
|
||||
[name cString]));
|
||||
else
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", md));
|
||||
}
|
||||
else
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", md));
|
||||
|
@ -875,8 +878,11 @@
|
|||
else
|
||||
days = [locale objectForKey: NSWeekDayNameArray];
|
||||
name = [days objectAtIndex: dow];
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s",
|
||||
if (name)
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s",
|
||||
[name cString]));
|
||||
else
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", dow));
|
||||
}
|
||||
else
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", dow));
|
||||
|
@ -917,9 +923,15 @@
|
|||
|
||||
++i;
|
||||
if (hd >= 12)
|
||||
ampm = [a objectAtIndex: 1];
|
||||
if ([a count] > 1)
|
||||
ampm = [a objectAtIndex: 1];
|
||||
else
|
||||
ampm = @"pm";
|
||||
else
|
||||
ampm = [a objectAtIndex: 0];
|
||||
if ([a count] > 0)
|
||||
ampm = [a objectAtIndex: 0];
|
||||
else
|
||||
ampm = @"am";
|
||||
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), [ampm cString]));
|
||||
j += k;
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <Foundation/NSFileManager.h>
|
||||
#include <Foundation/NSProcessInfo.h>
|
||||
#include <Foundation/NSValue.h>
|
||||
|
||||
#include <stdlib.h> // for getenv()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue