Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv31308/pci/emu10k1

Modified Files:
        emufx.c 
Log Message:
Added strlcpy() strlcat() functions

Index: emufx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- emufx.c     2 Apr 2003 14:35:57 -0000       1.31
+++ emufx.c     30 May 2003 12:28:35 -0000      1.32
@@ -1033,7 +1033,7 @@
                        memset(&gctl, 0, sizeof(gctl));
                        id = &ctl->kcontrol->id;
                        gctl.id.iface = id->iface;
-                       strncpy(gctl.id.name, id->name, sizeof(gctl.id.name));
+                       strlcpy(gctl.id.name, id->name, sizeof(gctl.id.name));
                        gctl.id.index = id->index;
                        gctl.id.device = id->device;
                        gctl.id.subdevice = id->subdevice;
@@ -1063,8 +1063,7 @@
        down(&emu->fx8010.lock);
        if ((err = snd_emu10k1_verify_controls(emu, icode)) < 0)
                goto __error;
-       strncpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name)-1);
-       emu->fx8010.name[sizeof(emu->fx8010.name)-1] = '\0';
+       strlcpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name));
        /* stop FX processor - this may be dangerous, but it's better to miss
           some samples than generate wrong ones - [jk] */
        if (emu->audigy)
@@ -1092,8 +1091,7 @@
        int err;
 
        down(&emu->fx8010.lock);
-       strncpy(icode->name, emu->fx8010.name, sizeof(icode->name)-1);
-       emu->fx8010.name[sizeof(emu->fx8010.name)-1] = '\0';
+       strlcpy(icode->name, emu->fx8010.name, sizeof(icode->name));
        /* ok, do the main job */
        snd_emu10k1_gpr_peek(emu, icode);
        snd_emu10k1_tram_peek(emu, icode);



-------------------------------------------------------
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

Reply via email to