git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
sound
/
core
/
oss
/
route.c
diff --git
a/sound/core/oss/route.c
b/sound/core/oss/route.c
index
fadc265
..
a33764f
100644
(file)
--- a/
sound/core/oss/route.c
+++ b/
sound/core/oss/route.c
@@
-95,7
+95,7
@@
static void route_to_channel_from_one(snd_pcm_plugin_t *plugin,
#undef CONV_LABELS
route_t *data = (route_t *)plugin->extra_data;
void *conv;
#undef CONV_LABELS
route_t *data = (route_t *)plugin->extra_data;
void *conv;
- const snd_pcm_plugin_channel_t *src_channel =
0
;
+ const snd_pcm_plugin_channel_t *src_channel =
NULL
;
unsigned int srcidx;
char *src, *dst;
int src_step, dst_step;
unsigned int srcidx;
char *src, *dst;
int src_step, dst_step;
@@
-149,11
+149,11
@@
static void route_to_channel(snd_pcm_plugin_t *plugin,
#endif
};
/* sum_type att shift */
#endif
};
/* sum_type att shift */
- static void *norm_labels[3 * 2 * 4] = {
0
,
+ static void *norm_labels[3 * 2 * 4] = {
NULL
,
&&norm_int32_8_noatt,
&&norm_int32_16_noatt,
&&norm_int32_24_noatt,
&&norm_int32_8_noatt,
&&norm_int32_16_noatt,
&&norm_int32_24_noatt,
-
0
,
+
NULL
,
&&norm_int32_8_att,
&&norm_int32_16_att,
&&norm_int32_24_att,
&&norm_int32_8_att,
&&norm_int32_16_att,
&&norm_int32_24_att,
@@
-462,7
+462,7
@@
static int route_load_ttable(snd_pcm_plugin_t *plugin,
for(srcidx = 0; srcidx < nsrcs; srcidx++)
dptr->srcs[srcidx] = srcs[srcidx];
} else
for(srcidx = 0; srcidx < nsrcs; srcidx++)
dptr->srcs[srcidx] = srcs[srcidx];
} else
- dptr->srcs =
0
;
+ dptr->srcs =
NULL
;
dptr++;
}
return 0;
dptr++;
}
return 0;