The patch titled Subject: lib/vsprintf.c: consume 'p' in format_decode has been added to the -mm tree. Its filename is lib-vsprintfc-consume-p-in-format_decode.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/lib-vsprintfc-consume-p-in-format_decode.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/lib-vsprintfc-consume-p-in-format_decode.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Subject: lib/vsprintf.c: consume 'p' in format_decode It seems a little simpler to consume the p from a %p specifier in format_decode, just as it is done for the surrounding %c, %s and %% cases. While there, delete a redundant and misplaced comment. Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: Jiri Kosina <jkosina@xxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/vsprintf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff -puN lib/vsprintf.c~lib-vsprintfc-consume-p-in-format_decode lib/vsprintf.c --- a/lib/vsprintf.c~lib-vsprintfc-consume-p-in-format_decode +++ a/lib/vsprintf.c @@ -1604,8 +1604,7 @@ qualifier: case 'p': spec->type = FORMAT_TYPE_PTR; - return fmt - start; - /* skip alnum */ + return ++fmt - start; case '%': spec->type = FORMAT_TYPE_PERCENT_CHAR; @@ -1794,7 +1793,7 @@ int vsnprintf(char *buf, size_t size, co break; case FORMAT_TYPE_PTR: - str = pointer(fmt+1, str, end, va_arg(args, void *), + str = pointer(fmt, str, end, va_arg(args, void *), spec); while (isalnum(*fmt)) fmt++; @@ -2232,7 +2231,7 @@ int bstr_printf(char *buf, size_t size, } case FORMAT_TYPE_PTR: - str = pointer(fmt+1, str, end, get_arg(void *), spec); + str = pointer(fmt, str, end, get_arg(void *), spec); while (isalnum(*fmt)) fmt++; break; _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are lib-vsprintfc-consume-p-in-format_decode.patch lib-vsprintfc-improve-sanity-check-in-vsnprintf.patch lib-vsprintfc-dont-try-to-fix-pointer-wrap-around.patch lib-vsprintfc-replace-while-with-do-while-in-skip_atoi.patch lib-string_get_size-remove-redundant-prefixes.patch lib-string_get_size-use-32-bit-arithmetic-when-possible.patch lib-string_get_size-return-void.patch lib-bitmap-more-signed-unsigned-conversions.patch linux-nodemaskh-update-bitmap-wrappers-to-take-unsigned-int.patch linux-cpumaskh-update-bitmap-wrappers-to-take-unsigned-int.patch lib-bitmap-update-bitmap_onto-to-unsigned.patch lib-bitmap-update-bitmap_onto-to-unsigned-checkpatch-fixes.patch lib-bitmap-change-parameters-of-bitmap_fold-to-unsigned.patch lib-bitmap-change-parameters-of-bitmap_fold-to-unsigned-fix.patch lib-bitmap-simplify-bitmap_pos_to_ord.patch lib-bitmap-simplify-bitmap_ord_to_pos.patch lib-bitmap-make-the-bits-parameter-of-bitmap_remap-unsigned.patch lib-remove-strnicmp.patch lib-interval_treec-simplify-includes.patch lib-sortc-use-simpler-includes.patch lib-dynamic_queue_limitsc-simplify-includes.patch lib-halfmd4c-simplify-includes.patch lib-idrc-remove-redundant-include.patch lib-genallocc-remove-redundant-include.patch lib-list_sortc-rearrange-includes.patch lib-md5c-simplify-include.patch lib-llistc-remove-redundant-include.patch lib-kobject_ueventc-remove-redundant-include.patch lib-nlattrc-remove-redundant-include.patch lib-plistc-remove-redundant-include.patch lib-radix-treec-change-to-simpler-include.patch lib-show_memc-remove-redundant-include.patch lib-sortc-move-include-inside-if-0.patch lib-stmp_devicec-replace-moduleh-include.patch lib-strncpy_from_userc-replace-moduleh-include.patch lib-percpu_idac-remove-redundant-includes.patch lib-lcmc-replace-include.patch lib-bitmapc-change-prototype-of-bitmap_copy_le.patch lib-bitmapc-elide-bitmap_copy_le-on-little-endian.patch lib-bitmap-change-bitmap_shift_right-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_right.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_right.patch lib-bitmap-yet-another-simplification-in-__bitmap_shift_right.patch lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_left.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_left.patch checkpatch-emit-an-error-when-using-predefined-timestamp-macros.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html