/[openvortex]/alsa/alsa-kernel/pci/emu10k1/emufx.c
ViewVC logotype

Diff of /alsa/alsa-kernel/pci/emu10k1/emufx.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by vizard, Sat May 31 02:35:12 2003 UTC revision 1.3 by vizard, Sun Jun 15 21:01:31 2003 UTC
# Line 1033  static int snd_emu10k1_list_controls(emu Line 1033  static int snd_emu10k1_list_controls(emu
1033                          memset(&gctl, 0, sizeof(gctl));                          memset(&gctl, 0, sizeof(gctl));
1034                          id = &ctl->kcontrol->id;                          id = &ctl->kcontrol->id;
1035                          gctl.id.iface = id->iface;                          gctl.id.iface = id->iface;
1036                          strncpy(gctl.id.name, id->name, sizeof(gctl.id.name));                          strlcpy(gctl.id.name, id->name, sizeof(gctl.id.name));
1037                          gctl.id.index = id->index;                          gctl.id.index = id->index;
1038                          gctl.id.device = id->device;                          gctl.id.device = id->device;
1039                          gctl.id.subdevice = id->subdevice;                          gctl.id.subdevice = id->subdevice;
# Line 1063  static int snd_emu10k1_icode_poke(emu10k Line 1063  static int snd_emu10k1_icode_poke(emu10k
1063          down(&emu->fx8010.lock);          down(&emu->fx8010.lock);
1064          if ((err = snd_emu10k1_verify_controls(emu, icode)) < 0)          if ((err = snd_emu10k1_verify_controls(emu, icode)) < 0)
1065                  goto __error;                  goto __error;
1066          strncpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name)-1);          strlcpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name));
         emu->fx8010.name[sizeof(emu->fx8010.name)-1] = '\0';  
1067          /* stop FX processor - this may be dangerous, but it's better to miss          /* stop FX processor - this may be dangerous, but it's better to miss
1068             some samples than generate wrong ones - [jk] */             some samples than generate wrong ones - [jk] */
1069          if (emu->audigy)          if (emu->audigy)
# Line 1092  static int snd_emu10k1_icode_peek(emu10k Line 1091  static int snd_emu10k1_icode_peek(emu10k
1091          int err;          int err;
1092    
1093          down(&emu->fx8010.lock);          down(&emu->fx8010.lock);
1094          strncpy(icode->name, emu->fx8010.name, sizeof(icode->name)-1);          strlcpy(icode->name, emu->fx8010.name, sizeof(icode->name));
         emu->fx8010.name[sizeof(emu->fx8010.name)-1] = '\0';  
1095          /* ok, do the main job */          /* ok, do the main job */
1096          snd_emu10k1_gpr_peek(emu, icode);          snd_emu10k1_gpr_peek(emu, icode);
1097          snd_emu10k1_tram_peek(emu, icode);          snd_emu10k1_tram_peek(emu, icode);

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26