Update of /cvsroot/alsa/alsa-kernel/synth/emux In directory sc8-pr-cvs1:/tmp/cvs-serv30321/synth/emux
Modified Files: soundfont.c Log Message: - added __user prefix to the user-space pointers. Index: soundfont.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/synth/emux/soundfont.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- soundfont.c 28 Jul 2003 10:09:52 -0000 1.8 +++ soundfont.c 16 Jan 2004 18:02:40 -0000 1.9 @@ -43,14 +43,14 @@ static void set_sample_counter(snd_sf_list_t *sflist, snd_soundfont_t *sf, snd_sf_sample_t *sp); static snd_sf_sample_t *sf_sample_new(snd_sf_list_t *sflist, snd_soundfont_t *sf); static void sf_sample_delete(snd_sf_list_t *sflist, snd_soundfont_t *sf, snd_sf_sample_t *sp); -static int load_map(snd_sf_list_t *sflist, const void *data, int count); -static int load_info(snd_sf_list_t *sflist, const void *data, long count); +static int load_map(snd_sf_list_t *sflist, const void __user *data, int count); +static int load_info(snd_sf_list_t *sflist, const void __user *data, long count); static int remove_info(snd_sf_list_t *sflist, snd_soundfont_t *sf, int bank, int instr); static void init_voice_info(soundfont_voice_info_t *avp); static void init_voice_parm(soundfont_voice_parm_t *pp); static snd_sf_sample_t *set_sample(snd_soundfont_t *sf, soundfont_voice_info_t *avp); static snd_sf_sample_t *find_sample(snd_soundfont_t *sf, int sample_id); -static int load_data(snd_sf_list_t *sflist, const void *data, long count); +static int load_data(snd_sf_list_t *sflist, const void __user *data, long count); static void rebuild_presets(snd_sf_list_t *sflist); static void add_preset(snd_sf_list_t *sflist, snd_sf_zone_t *cur); static void delete_preset(snd_sf_list_t *sflist, snd_sf_zone_t *zp); @@ -111,7 +111,7 @@ * it wants to do with it. */ int -snd_soundfont_load(snd_sf_list_t *sflist, const void *data, long count, int client) +snd_soundfont_load(snd_sf_list_t *sflist, const void __user *data, long count, int client) { soundfont_patch_info_t patch; unsigned long flags; @@ -211,7 +211,7 @@ /* open patch; create sf list */ static int -open_patch(snd_sf_list_t *sflist, const char *data, int count, int client) +open_patch(snd_sf_list_t *sflist, const char __user *data, int count, int client) { soundfont_open_parm_t parm; snd_soundfont_t *sf; @@ -394,7 +394,7 @@ /* load voice map */ static int -load_map(snd_sf_list_t *sflist, const void *data, int count) +load_map(snd_sf_list_t *sflist, const void __user *data, int count) { snd_sf_zone_t *zp, *prevp; snd_soundfont_t *sf; @@ -490,7 +490,7 @@ * open soundfont. */ static int -load_info(snd_sf_list_t *sflist, const void *data, long count) +load_info(snd_sf_list_t *sflist, const void __user *data, long count) { snd_soundfont_t *sf; snd_sf_zone_t *zone; @@ -674,7 +674,7 @@ * routine. */ static int -load_data(snd_sf_list_t *sflist, const void *data, long count) +load_data(snd_sf_list_t *sflist, const void __user *data, long count) { snd_soundfont_t *sf; soundfont_sample_info_t sample_info; @@ -912,7 +912,7 @@ /* load GUS patch */ static int -load_guspatch(snd_sf_list_t *sflist, const char *data, long count, int client) +load_guspatch(snd_sf_list_t *sflist, const char __user *data, long count, int client) { struct patch_info patch; snd_soundfont_t *sf; @@ -1085,7 +1085,7 @@ /* load GUS patch */ int -snd_soundfont_load_guspatch(snd_sf_list_t *sflist, const char *data, +snd_soundfont_load_guspatch(snd_sf_list_t *sflist, const char __user *data, long count, int client) { int rc; ------------------------------------------------------- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog