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

Formatting fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9026 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2001-02-07 13:22:12 +00:00
parent 2fe7890356
commit 90c95b763a
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -2,6 +2,8 @@
* Source/GSFormat.m: Fixed error in PAD() macro - it was failing to
decrement a counter - and looping forever.
Fixed error in formatted output of string arguments ... was
crashing with range exception.
2001-02-04 Richard Frith-Macdonald <rfm@gnu.org>

17
Source/GSFormat.m
View file

@ -1585,11 +1585,13 @@ NSDictionary *locale)
{
/* This is complicated. We have to transform the multibyte
string into a unicode string. */
NSString *str;
NSRange r;
const char *str = (const char*)string;
unsigned slen = strlen(str);
NSStringEncoding enc = GetDefEncoding();
str = [NSString stringWithCString: (const char *)string];
len = prec != -1 ? prec : [str length];
len = prec != -1 ? prec : slen;
if (len > slen)
len = slen;
/* Allocate dynamically an array which definitely is long
enough for the wide character version. */
@ -1600,9 +1602,8 @@ NSDictionary *locale)
else
string_malloced = 1;
r.location = 0;
r.length = len;
[str getCharacters: string range: r];
for (slen = 0; slen < len; slen++)
string[slen] = encode_chartouni(str[slen], enc);
}
else
{
@ -1632,7 +1633,7 @@ NSDictionary *locale)
while (prc--) *sp = *wsp;
}
if ((width -= len) < 0)
if ((width -= len) <= 0)
{
outstring (string, len);
break;