gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid compiler warnings

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39682 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-04-19 08:02:13 +00:00
parent 42e10e52cd
commit 41c920a83d
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Source/NSCalendarDate.m
View file

@ -1941,6 +1941,7 @@ static void outputValueWithFormat(int v, char *fldfmt, DescriptionInfo *info)
while (i < lf)
{
NSString *str;
BOOL mtag = NO;
BOOL dtag = NO;
BOOL ycent = NO;
@ -1956,8 +1957,9 @@ static void outputValueWithFormat(int v, char *fldfmt, DescriptionInfo *info)
if (f[i] == '%')
{
i++;
fldfmt[fmtlen++] = '%'; // start format with %
while (fmtlen < 5 && f[i] >= '0' && f[i] <= '9') // field width specified
fldfmt[fmtlen++] = '%';
// field width specified
while (fmtlen < 5 && f[i] >= '0' && f[i] <= '9')
{
fldfmt[fmtlen++] = f[i];
width = 10 * width + f[i] - '0';
@ -1965,8 +1967,12 @@ static void outputValueWithFormat(int v, char *fldfmt, DescriptionInfo *info)
}
if (fmtlen >= 5 || width > MAX_FLD_WIDTH)
{
// ignore formats that specify field width greater than the max allowed
i -= fmtlen; // set i back so all ignored characters will be copied
/* ignore formats that specify field width
* greater than the max allowed.
* set i back so all ignored characters will
* be copied
*/
i -= fmtlen;
}
// check the character that comes after
@ -1996,26 +2002,22 @@ static void outputValueWithFormat(int v, char *fldfmt, DescriptionInfo *info)
break;
case 'c':
[self _format: [LOCALE objectForKey: NSTimeFormatString]
locale: locale
info: info];
str = (NSString*)[LOCALE objectForKey: NSTimeFormatString];
[self _format: str locale: locale info: info];
Grow(info, 1);
info->t[info->offset++] = ' ';
[self _format: [LOCALE objectForKey: NSDateFormatString]
locale: locale
info: info];
str = (NSString*)[LOCALE objectForKey: NSDateFormatString];
[self _format: str locale: locale info: info];
break;
case 'X':
[self _format: [LOCALE objectForKey: NSTimeFormatString]
locale: locale
info: info];
str = (NSString*)[LOCALE objectForKey: NSTimeFormatString];
[self _format: str locale: locale info: info];
break;
case 'x':
[self _format: [LOCALE objectForKey: NSDateFormatString]
locale: locale
info: info];
str = (NSString*)[LOCALE objectForKey: NSDateFormatString];
[self _format: str locale: locale info: info];
break;
// is it the year