Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176364
b: refs/heads/master
c: 0f4f81d
h: refs/heads/master
v: v3
  • Loading branch information
André Goddard Rosa authored and Linus Torvalds committed Dec 15, 2009
1 parent 4f3e4f5 commit 773b148
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3768f0b1d18369bbb4ddc3adca791d26704e8047
refs/heads/master: 0f4f81dce93774a447da3ceb98cce193ef84a3fa
6 changes: 3 additions & 3 deletions trunk/lib/vsprintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,12 +546,12 @@ static char *number(char *buf, char *end, unsigned long long num,
return buf;
}

static char *string(char *buf, char *end, char *s, struct printf_spec spec)
static char *string(char *buf, char *end, const char *s, struct printf_spec spec)
{
int len, i;

if ((unsigned long)s < PAGE_SIZE)
s = "<NULL>";
s = "(null)";

len = strnlen(s, spec.precision);

Expand Down Expand Up @@ -1498,7 +1498,7 @@ do { \
size_t len;
if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
|| (unsigned long)save_str < PAGE_SIZE)
save_str = "<NULL>";
save_str = "(null)";
len = strlen(save_str);
if (str + len + 1 < end)
memcpy(str, save_str, len + 1);
Expand Down

0 comments on commit 773b148

Please sign in to comment.