Update of /cvsroot/alsa/alsa-kernel/core/seq
In directory sc8-pr-cvs1:/tmp/cvs-serv31308/core/seq
Modified Files:
seq_clientmgr.c seq_device.c seq_instr.c seq_ports.c
Log Message:
Added strlcpy() strlcat() functions
Index: seq_clientmgr.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_clientmgr.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- seq_clientmgr.c 20 May 2003 21:43:29 -0000 1.20
+++ seq_clientmgr.c 30 May 2003 12:28:33 -0000 1.21
@@ -1184,10 +1184,9 @@
return -EINVAL;
/* fill the info fields */
- if (client_info.name[0]) {
- strncpy(client->name, client_info.name, sizeof(client->name)-1);
- client->name[sizeof(client->name)-1] = '\0';
- }
+ if (client_info.name[0])
+ strlcpy(client->name, client_info.name, sizeof(client->name));
+
client->filter = client_info.filter;
client->event_lost = client_info.event_lost;
memcpy(client->event_filter, client_info.event_filter, 32);
@@ -1487,9 +1486,8 @@
/* set queue name */
if (! info.name[0])
- sprintf(info.name, "Queue-%d", q->queue);
- strncpy(q->name, info.name, sizeof(q->name)-1);
- q->name[sizeof(q->name)-1] = 0;
+ snprintf(info.name, sizeof(info.name), "Queue-%d", q->queue);
+ strlcpy(q->name, info.name, sizeof(q->name));
queuefree(q);
if (copy_to_user(arg, &info, sizeof(info)))
@@ -1526,8 +1524,7 @@
info.queue = q->queue;
info.owner = q->owner;
info.locked = q->locked;
- strncpy(info.name, q->name, sizeof(info.name) - 1);
- info.name[sizeof(info.name)-1] = 0;
+ strlcpy(info.name, q->name, sizeof(info.name));
queuefree(q);
if (copy_to_user(arg, &info, sizeof(info)))
@@ -1565,8 +1562,7 @@
queuefree(q);
return -EPERM;
}
- strncpy(q->name, info.name, sizeof(q->name) - 1);
- q->name[sizeof(q->name)-1] = 0;
+ strlcpy(q->name, info.name, sizeof(q->name));
queuefree(q);
return 0;
Index: seq_device.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_device.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- seq_device.c 20 May 2003 21:43:30 -0000 1.12
+++ seq_device.c 30 May 2003 12:28:33 -0000 1.13
@@ -187,8 +187,7 @@
/* set up device info */
dev->card = card;
dev->device = device;
- strncpy(dev->id, id, sizeof(dev->id) - 1);
- dev->id[sizeof(dev->id) - 1] = 0;
+ strlcpy(dev->id, id, sizeof(dev->id));
dev->argsize = argsize;
dev->status = SNDRV_SEQ_DEVICE_FREE;
@@ -350,8 +349,7 @@
memset(ops, 0, sizeof(*ops));
/* set up driver entry */
- strncpy(ops->id, id, sizeof(ops->id) - 1);
- ops->id[sizeof(ops->id) - 1] = 0;
+ strlcpy(ops->id, id, sizeof(ops->id));
init_MUTEX(&ops->reg_mutex);
ops->driver = DRIVER_EMPTY;
INIT_LIST_HEAD(&ops->dev_list);
Index: seq_instr.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_instr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- seq_instr.c 31 Jan 2003 15:19:33 -0000 1.7
+++ seq_instr.c 30 May 2003 12:28:33 -0000 1.8
@@ -478,8 +478,7 @@
}
instr->ops = ops;
instr->instr = put.id.instr;
- strncpy(instr->name, put.data.name, sizeof(instr->name)-1);
- instr->name[sizeof(instr->name)-1] = '\0';
+ strlcpy(instr->name, put.data.name, sizeof(instr->name));
instr->type = put.data.type;
if (instr->type == SNDRV_SEQ_INSTR_ATYPE_DATA) {
result = ops->put(ops->private_data,
Index: seq_ports.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_ports.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- seq_ports.c 28 Feb 2003 15:08:20 -0000 1.13
+++ seq_ports.c 30 May 2003 12:28:33 -0000 1.14
@@ -338,10 +338,8 @@
snd_assert(port && info, return -EINVAL);
/* set port name */
- if (info->name[0]) {
- strncpy(port->name, info->name, sizeof(port->name)-1);
- port->name[sizeof(port->name)-1] = '\0';
- }
+ if (info->name[0])
+ strlcpy(port->name, info->name, sizeof(port->name));
/* set capabilities */
port->capability = info->capability;
@@ -363,7 +361,7 @@
snd_assert(port && info, return -EINVAL);
/* get port name */
- strncpy(info->name, port->name, sizeof(info->name));
+ strlcpy(info->name, port->name, sizeof(info->name));
/* get capabilities */
info->capability = port->capability;
@@ -621,10 +619,8 @@
/* Set up the port */
memset(&portinfo, 0, sizeof(portinfo));
portinfo.addr.client = client;
- if (portname)
- strncpy(portinfo.name, portname, sizeof(portinfo.name));
- else
- sprintf(portinfo.name, "Unamed port");
+ strlcpy(portinfo.name, portname ? portname : "Unamed port",
+ sizeof(portinfo.name));
portinfo.capability = cap;
portinfo.type = type;
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
