Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-12 16:11:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isdn: Constify some function parameters

Browse Source 
The coming initify gcc plugin expects const pointer types, and caught
some __printf arguments that weren't const yet. This fixes those.

Signed-off-by: Emese Revfy <re.emese@gmail.com>
[kees: expanded commit message]
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Emese Revfy 2016-12-16 13:40:47 -08:00 committed by David S. Miller
parent 9a60c90722
commit a6b3c48312
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/isdn/hisax/config.c
View File

@ -659,7 +659,7 @@ int jiftime(char *s, long mark)
static u_char tmpbuf[HISAX_STATUS_BUFSIZE]; static u_char tmpbuf[HISAX_STATUS_BUFSIZE];
void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, void VHiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt,
va_list args) va_list args)
{ {
/* if head == NULL the fmt contains the full info */ /* if head == NULL the fmt contains the full info */
@ -669,23 +669,24 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
u_char *p; u_char *p;
isdn_ctrl ic; isdn_ctrl ic;
int len; int len;
const u_char *data;
if (!cs) { if (!cs) {
printk(KERN_WARNING "HiSax: No CardStatus for message"); printk(KERN_WARNING "HiSax: No CardStatus for message");
return; return;
} }
spin_lock_irqsave(&cs->statlock, flags); spin_lock_irqsave(&cs->statlock, flags);
p = tmpbuf;
if (head) { if (head) {
p = tmpbuf;
p += jiftime(p, jiffies); p += jiftime(p, jiffies);
p += sprintf(p, " %s", head); p += sprintf(p, " %s", head);
p += vsprintf(p, fmt, args); p += vsprintf(p, fmt, args);
*p++ = '\n'; *p++ = '\n';
*p = 0; *p = 0;
len = p - tmpbuf; len = p - tmpbuf;
p = tmpbuf; data = tmpbuf;
} else { } else {
p = fmt; data = fmt;
len = strlen(fmt); len = strlen(fmt);
} }
if (len > HISAX_STATUS_BUFSIZE) { if (len > HISAX_STATUS_BUFSIZE) {
@ -699,13 +700,12 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
if (i >= len) if (i >= len)
i = len; i = len;
len -= i; len -= i;
memcpy(cs->status_write, p, i); memcpy(cs->status_write, data, i);
cs->status_write += i; cs->status_write += i;
if (cs->status_write > cs->status_end) if (cs->status_write > cs->status_end)
cs->status_write = cs->status_buf; cs->status_write = cs->status_buf;
p += i;
if (len) { if (len) {
memcpy(cs->status_write, p, len); memcpy(cs->status_write, data + i, len);
cs->status_write += len; cs->status_write += len;
} }
#ifdef KERNELSTACK_DEBUG #ifdef KERNELSTACK_DEBUG
@ -729,7 +729,7 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
} }
} }
void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...) void HiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, ...)
{ {
va_list args; va_list args;

4
drivers/isdn/hisax/hisax.h
View File

@ -1288,9 +1288,9 @@ int jiftime(char *s, long mark);
int HiSax_command(isdn_ctrl *ic); int HiSax_command(isdn_ctrl *ic);
int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb); int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb);
__printf(3, 4) __printf(3, 4)
void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...); void HiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, ...);
__printf(3, 0) __printf(3, 0)
void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args); void VHiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, va_list args);
void HiSax_reportcard(int cardnr, int sel); void HiSax_reportcard(int cardnr, int sel);
int QuickHex(char *txt, u_char *p, int cnt); int QuickHex(char *txt, u_char *p, int cnt);
void LogFrame(struct IsdnCardState *cs, u_char *p, int size); void LogFrame(struct IsdnCardState *cs, u_char *p, int size);