Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac29e62 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] drivers/cdrom/*: trivial vsnprintf() conversion 



Fixing sbpcd.c baroque error printing in process.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 18debbbc

drivers/cdrom/optcd.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void debug(int debug_this, const char* fmt, ...) 
		return;



	va_start(args, fmt);

	vsprintf(s, fmt, args);

	vsnprintf(s, sizeof(s), fmt, args);

	printk(KERN_DEBUG "optcd: %s\n", s);

	va_end(args);

}

drivers/cdrom/sbpcd.c

+2 −3
Original line number Diff line number Diff line
@@ -770,11 +770,10 @@ static void msg(int level, const char *fmt, ...) 
	

	msgnum++;

	if (msgnum>99) msgnum=0;

	sprintf(buf, MSG_LEVEL "%s-%d [%02d]:  ", major_name, current_drive - D_S, msgnum);

	va_start(args, fmt);

	vsprintf(&buf[18], fmt, args);

	vsnprintf(buf, sizeof(buf), fmt, args);

	va_end(args);

	printk(buf);

	printk(MSG_LEVEL "%s-%d [%02d]:  %s", major_name, current_drive - D_S, msgnum, buf);

#if KLOGD_PAUSE

	sbp_sleep(KLOGD_PAUSE); /* else messages get lost */

#endif /* KLOGD_PAUSE */