summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b5ff992)
Cleanup by moving variables closer to the scope where they're used in fact.
Also, remove unneeded ones.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
case 'F':
case 'f':
ptr = dereference_function_descriptor(ptr);
case 'F':
case 'f':
ptr = dereference_function_descriptor(ptr);
case 'S':
return symbol_string(buf, end, ptr, spec, *fmt);
case 'R':
case 'S':
return symbol_string(buf, end, ptr, spec, *fmt);
case 'R':
int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
{
unsigned long long num;
int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
{
unsigned long long num;
- char *str, *end, c;
- int read;
struct printf_spec spec = {0};
/* Reject out-of-range values early. Large positive sizes are
struct printf_spec spec = {0};
/* Reject out-of-range values early. Large positive sizes are
while (*fmt) {
const char *old_fmt = fmt;
while (*fmt) {
const char *old_fmt = fmt;
-
- read = format_decode(fmt, &spec);
+ int read = format_decode(fmt, &spec);
spec.precision = va_arg(args, int);
break;
spec.precision = va_arg(args, int);
break;
+ case FORMAT_TYPE_CHAR: {
+ char c;
+
if (!(spec.flags & LEFT)) {
while (--spec.field_width > 0) {
if (str < end)
if (!(spec.flags & LEFT)) {
while (--spec.field_width > 0) {
if (str < end)
case FORMAT_TYPE_STR:
str = string(str, end, va_arg(args, char *), spec);
case FORMAT_TYPE_STR:
str = string(str, end, va_arg(args, char *), spec);
{
struct printf_spec spec = {0};
char *str, *end;
{
struct printf_spec spec = {0};
char *str, *end;
str = (char *)bin_buf;
end = (char *)(bin_buf + size);
str = (char *)bin_buf;
end = (char *)(bin_buf + size);
} while (0)
while (*fmt) {
} while (0)
while (*fmt) {
- read = format_decode(fmt, &spec);
+ int read = format_decode(fmt, &spec);
fmt += read;
switch (spec.type) {
case FORMAT_TYPE_NONE:
fmt += read;
switch (spec.type) {
case FORMAT_TYPE_NONE:
+ case FORMAT_TYPE_INVALID:
+ case FORMAT_TYPE_PERCENT_CHAR:
break;
case FORMAT_TYPE_WIDTH:
break;
case FORMAT_TYPE_WIDTH:
- case FORMAT_TYPE_PERCENT_CHAR:
- break;
-
- case FORMAT_TYPE_INVALID:
- break;
-
case FORMAT_TYPE_NRCHARS: {
/* skip %n 's argument */
int qualifier = spec.qualifier;
case FORMAT_TYPE_NRCHARS: {
/* skip %n 's argument */
int qualifier = spec.qualifier;
*/
int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
{
*/
int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
{
- unsigned long long num;
- char *str, *end, c;
- const char *args = (const char *)bin_buf;
struct printf_spec spec = {0};
struct printf_spec spec = {0};
+ char *str, *end;
+ const char *args = (const char *)bin_buf;
if (WARN_ON_ONCE((int) size < 0))
return 0;
if (WARN_ON_ONCE((int) size < 0))
return 0;
const char *old_fmt = fmt;
const char *old_fmt = fmt;
-
- read = format_decode(fmt, &spec);
+ int read = format_decode(fmt, &spec);
spec.precision = get_arg(int);
break;
spec.precision = get_arg(int);
break;
+ case FORMAT_TYPE_CHAR: {
+ char c;
+
if (!(spec.flags & LEFT)) {
while (--spec.field_width > 0) {
if (str < end)
if (!(spec.flags & LEFT)) {
while (--spec.field_width > 0) {
if (str < end)
case FORMAT_TYPE_STR: {
const char *str_arg = args;
case FORMAT_TYPE_STR: {
const char *str_arg = args;
- size_t len = strlen(str_arg);
- args += len + 1;
+ args += strlen(str_arg) + 1;
str = string(str, end, (char *)str_arg, spec);
break;
}
str = string(str, end, (char *)str_arg, spec);
break;
}
break;
case FORMAT_TYPE_PERCENT_CHAR:
break;
case FORMAT_TYPE_PERCENT_CHAR:
- if (str < end)
- *str = '%';
- ++str;
- break;
-
case FORMAT_TYPE_INVALID:
if (str < end)
*str = '%';
case FORMAT_TYPE_INVALID:
if (str < end)
*str = '%';
+ default: {
+ unsigned long long num;
+
switch (spec.type) {
case FORMAT_TYPE_LONG_LONG:
num = get_arg(long long);
break;
case FORMAT_TYPE_ULONG:
switch (spec.type) {
case FORMAT_TYPE_LONG_LONG:
num = get_arg(long long);
break;
case FORMAT_TYPE_ULONG:
- num = get_arg(unsigned long);
- break;
case FORMAT_TYPE_LONG:
num = get_arg(unsigned long);
break;
case FORMAT_TYPE_LONG:
num = get_arg(unsigned long);
break;
}
str = number(str, end, num, spec);
}
str = number(str, end, num, spec);
+ } /* default: */
+ } /* switch(spec.type) */
+ } /* while(*fmt) */
if (size > 0) {
if (str < end)
if (size > 0) {
if (str < end)
char digit;
int num = 0;
int qualifier, base, field_width;
char digit;
int num = 0;
int qualifier, base, field_width;
while (*fmt && *str) {
/* skip any white space in format */
while (*fmt && *str) {
/* skip any white space in format */
- base = 10;
- is_sign = 0;
if (!*fmt || !*str)
break;
if (!*fmt || !*str)
break;
+ base = 10;
+ is_sign = 0;
+
switch (*fmt++) {
case 'c':
{
switch (*fmt++) {
case 'c':
{