Skip to content

M
mpd
Commit e1f58fdc authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

oss: use unsigned integers

Convert the num_supported and num_unsupported variables from signed to unsigned.
parent 4958a6f5
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 14 deletions
src/output/oss_plugin.c
View file @ e1f58fdc
...@@ -52,9 +52,9 @@ struct oss_data { ...@@ -52,9 +52,9 @@ struct oss_data {
struct audio_format audio_format; struct audio_format audio_format;
int bitFormat; int bitFormat;
int *supported[3]; int *supported[3];
int num_supported[3]; unsigned num_supported[3];
int *unsupported[3]; int *unsupported[3];
int num_unsupported[3]; unsigned num_unsupported[3];
/** the mixer object associated with this output */ /** the mixer object associated with this output */
struct mixer *mixer; struct mixer *mixer;
...@@ -95,10 +95,9 @@ oss_param_from_ioctl(unsigned param) ...@@ -95,10 +95,9 @@ oss_param_from_ioctl(unsigned param)
static int static int
oss_find_supported_param(struct oss_data *od, unsigned param, int val) oss_find_supported_param(struct oss_data *od, unsigned param, int val)
{ {
int i;
enum oss_param idx = oss_param_from_ioctl(param); enum oss_param idx = oss_param_from_ioctl(param);
for (i = 0; i < od->num_supported[idx]; i++) for (unsigned i = 0; i < od->num_supported[idx]; i++)
if (od->supported[idx][i] == val) if (od->supported[idx][i] == val)
return 1; return 1;
...@@ -125,13 +124,12 @@ oss_can_convert(int idx, int val) ...@@ -125,13 +124,12 @@ oss_can_convert(int idx, int val)
static int static int
oss_get_supported_param(struct oss_data *od, unsigned param, int val) oss_get_supported_param(struct oss_data *od, unsigned param, int val)
{ {
int i;
enum oss_param idx = oss_param_from_ioctl(param); enum oss_param idx = oss_param_from_ioctl(param);
int ret = -1; int ret = -1;
int least = val; int least = val;
int diff; int diff;
for (i = 0; i < od->num_supported[idx]; i++) { for (unsigned i = 0; i < od->num_supported[idx]; i++) {
diff = od->supported[idx][i] - val; diff = od->supported[idx][i] - val;
if (diff < 0) if (diff < 0)
diff = -diff; diff = -diff;
...@@ -150,10 +148,9 @@ oss_get_supported_param(struct oss_data *od, unsigned param, int val) ...@@ -150,10 +148,9 @@ oss_get_supported_param(struct oss_data *od, unsigned param, int val)
static int static int
oss_find_unsupported_param(struct oss_data *od, unsigned param, int val) oss_find_unsupported_param(struct oss_data *od, unsigned param, int val)
{ {
int i;
enum oss_param idx = oss_param_from_ioctl(param); enum oss_param idx = oss_param_from_ioctl(param);
for (i = 0; i < od->num_unsupported[idx]; i++) { for (unsigned i = 0; i < od->num_unsupported[idx]; i++) {
if (od->unsupported[idx][i] == val) if (od->unsupported[idx][i] == val)
return 1; return 1;
} }
...@@ -187,11 +184,10 @@ oss_add_unsupported_param(struct oss_data *od, unsigned param, int val) ...@@ -187,11 +184,10 @@ oss_add_unsupported_param(struct oss_data *od, unsigned param, int val)
static void static void
oss_remove_supported_param(struct oss_data *od, unsigned param, int val) oss_remove_supported_param(struct oss_data *od, unsigned param, int val)
{ {
int i; unsigned j = 0;
int j = 0;
enum oss_param idx = oss_param_from_ioctl(param); enum oss_param idx = oss_param_from_ioctl(param);
for (i = 0; i < od->num_supported[idx] - 1; i++) { for (unsigned i = 0; i < od->num_supported[idx] - 1; i++) {
if (od->supported[idx][i] == val) if (od->supported[idx][i] == val)
j = 1; j = 1;
od->supported[idx][i] = od->supported[idx][i + j]; od->supported[idx][i] = od->supported[idx][i + j];
...@@ -205,11 +201,10 @@ oss_remove_supported_param(struct oss_data *od, unsigned param, int val) ...@@ -205,11 +201,10 @@ oss_remove_supported_param(struct oss_data *od, unsigned param, int val)
static void static void
oss_remove_unsupported_param(struct oss_data *od, unsigned param, int val) oss_remove_unsupported_param(struct oss_data *od, unsigned param, int val)
{ {
int i; unsigned j = 0;
int j = 0;
enum oss_param idx = oss_param_from_ioctl(param); enum oss_param idx = oss_param_from_ioctl(param);
for (i = 0; i < od->num_unsupported[idx] - 1; i++) { for (unsigned i = 0; i < od->num_unsupported[idx] - 1; i++) {
if (od->unsupported[idx][i] == val) if (od->unsupported[idx][i] == val)
j = 1; j = 1;
od->unsupported[idx][i] = od->unsupported[idx][i + j]; od->unsupported[idx][i] = od->unsupported[idx][i + j];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment