/[openvortex]/alsa/alsa-kernel/core/oss/mixer_oss.c
ViewVC logotype

Diff of /alsa/alsa-kernel/core/oss/mixer_oss.c

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

revision 1.2 by vizard, Sat May 31 02:35:10 2003 UTC revision 1.3 by vizard, Sun Jun 15 21:01:30 2003 UTC
# Line 85  static int snd_mixer_oss_info(snd_mixer_ Line 85  static int snd_mixer_oss_info(snd_mixer_
85          struct mixer_info info;          struct mixer_info info;
86                    
87          memset(&info, 0, sizeof(info));          memset(&info, 0, sizeof(info));
88          strncpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver, sizeof(info.id) - 1);          strlcpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver, sizeof(info.id));
89          strncpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername, sizeof(info.name) - 1);          strlcpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername, sizeof(info.name));
90          info.modify_counter = card->mixer_oss_change_count;          info.modify_counter = card->mixer_oss_change_count;
91          if (copy_to_user(_info, &info, sizeof(info)))          if (copy_to_user(_info, &info, sizeof(info)))
92                  return -EFAULT;                  return -EFAULT;
# Line 101  static int snd_mixer_oss_info_obsolete(s Line 101  static int snd_mixer_oss_info_obsolete(s
101          _old_mixer_info info;          _old_mixer_info info;
102                    
103          memset(&info, 0, sizeof(info));          memset(&info, 0, sizeof(info));
104          strncpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver, sizeof(info.id) - 1);          strlcpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver, sizeof(info.id));
105          strncpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername, sizeof(info.name) - 1);          strlcpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername, sizeof(info.name));
106          if (copy_to_user(_info, &info, sizeof(info)))          if (copy_to_user(_info, &info, sizeof(info)))
107                  return -EFAULT;                  return -EFAULT;
108          return 0;          return 0;
# Line 376  int snd_mixer_oss_ioctl_card(snd_card_t Line 376  int snd_mixer_oss_ioctl_card(snd_card_t
376    
377  static struct file_operations snd_mixer_oss_f_ops =  static struct file_operations snd_mixer_oss_f_ops =
378  {  {
 #ifndef LINUX_2_2  
379          .owner =        THIS_MODULE,          .owner =        THIS_MODULE,
 #endif  
380          .open =         snd_mixer_oss_open,          .open =         snd_mixer_oss_open,
381          .release =      snd_mixer_oss_release,          .release =      snd_mixer_oss_release,
382          .ioctl =        snd_mixer_oss_ioctl,          .ioctl =        snd_mixer_oss_ioctl,
# Line 1215  static int snd_mixer_oss_notify_handler( Line 1213  static int snd_mixer_oss_notify_handler(
1213                  }                  }
1214                  mixer->oss_dev_alloc = 1;                  mixer->oss_dev_alloc = 1;
1215                  mixer->card = card;                  mixer->card = card;
1216                  if (*card->mixername) {                  if (*card->mixername)
1217                          strncpy(mixer->name, card->mixername, sizeof(mixer->name) - 1);                          strlcpy(mixer->name, card->mixername, sizeof(mixer->name));
1218                          mixer->name[sizeof(mixer->name)-1] = 0;                  else
1219                  } else                          strlcpy(mixer->name, name, sizeof(mixer->name));
                         strcpy(mixer->name, name);  
1220  #ifdef SNDRV_OSS_INFO_DEV_MIXERS  #ifdef SNDRV_OSS_INFO_DEV_MIXERS
1221                  snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIXERS,                  snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIXERS,
1222                                        card->number,                                        card->number,

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