mirror of
https://github.com/alsa-project/alsa-utils
synced 2024-09-20 01:59:57 +02:00
- fixed compile warnings on gcc3.3.
This commit is contained in:
parent
c8ae22ea69
commit
dfe70d8fbb
2 changed files with 8 additions and 7 deletions
|
@ -983,7 +983,7 @@ mixer_draw_frame (void)
|
||||||
mixer_dc (DC_TEXT);
|
mixer_dc (DC_TEXT);
|
||||||
sprintf (string, "%s", mixer_card_name);
|
sprintf (string, "%s", mixer_card_name);
|
||||||
max_len = mixer_max_x - 2 - 6 - 2;
|
max_len = mixer_max_x - 2 - 6 - 2;
|
||||||
if (strlen (string) > max_len)
|
if ((int)strlen (string) > max_len)
|
||||||
string[max_len] = 0;
|
string[max_len] = 0;
|
||||||
addstr (string);
|
addstr (string);
|
||||||
|
|
||||||
|
@ -994,7 +994,7 @@ mixer_draw_frame (void)
|
||||||
mixer_dc (DC_TEXT);
|
mixer_dc (DC_TEXT);
|
||||||
sprintf (string, "%s", mixer_device_name);
|
sprintf (string, "%s", mixer_device_name);
|
||||||
max_len = mixer_max_x - 2 - 6 - 2;
|
max_len = mixer_max_x - 2 - 6 - 2;
|
||||||
if (strlen (string) > max_len)
|
if ((int)strlen (string) > max_len)
|
||||||
string[max_len] = 0;
|
string[max_len] = 0;
|
||||||
addstr (string);
|
addstr (string);
|
||||||
|
|
||||||
|
@ -1088,7 +1088,8 @@ mixer_show_text (char *title,
|
||||||
float hoffs, voffs;
|
float hoffs, voffs;
|
||||||
char *p, *text_offs = text;
|
char *p, *text_offs = text;
|
||||||
int x1, x2, y1, y2;
|
int x1, x2, y1, y2;
|
||||||
int i, n, l, r, block, stipple;
|
int i, n, l, r;
|
||||||
|
unsigned long block, stipple;
|
||||||
|
|
||||||
/* coords
|
/* coords
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -836,7 +836,7 @@ static int parse_control_id(const char *str, snd_ctl_elem_id_t *id)
|
||||||
if (*str == '\'' || *str == '\"') {
|
if (*str == '\'' || *str == '\"') {
|
||||||
c = *str++;
|
c = *str++;
|
||||||
while (*str && *str != c) {
|
while (*str && *str != c) {
|
||||||
if (size < sizeof(buf)) {
|
if (size < (int)sizeof(buf)) {
|
||||||
*ptr++ = *str;
|
*ptr++ = *str;
|
||||||
size++;
|
size++;
|
||||||
}
|
}
|
||||||
|
@ -846,7 +846,7 @@ static int parse_control_id(const char *str, snd_ctl_elem_id_t *id)
|
||||||
str++;
|
str++;
|
||||||
} else {
|
} else {
|
||||||
while (*str && *str != ',') {
|
while (*str && *str != ',') {
|
||||||
if (size < sizeof(buf)) {
|
if (size < (int)sizeof(buf)) {
|
||||||
*ptr++ = *str;
|
*ptr++ = *str;
|
||||||
size++;
|
size++;
|
||||||
}
|
}
|
||||||
|
@ -894,7 +894,7 @@ static int parse_simple_id(const char *str, snd_mixer_selem_id_t *sid)
|
||||||
size = 1; /* for '\0' */
|
size = 1; /* for '\0' */
|
||||||
if (*str != '"' && *str != '\'') {
|
if (*str != '"' && *str != '\'') {
|
||||||
while (*str && *str != ',') {
|
while (*str && *str != ',') {
|
||||||
if (size < sizeof(buf)) {
|
if (size < (int)sizeof(buf)) {
|
||||||
*ptr++ = *str;
|
*ptr++ = *str;
|
||||||
size++;
|
size++;
|
||||||
}
|
}
|
||||||
|
@ -903,7 +903,7 @@ static int parse_simple_id(const char *str, snd_mixer_selem_id_t *sid)
|
||||||
} else {
|
} else {
|
||||||
c = *str++;
|
c = *str++;
|
||||||
while (*str && *str != c) {
|
while (*str && *str != c) {
|
||||||
if (size < sizeof(buf)) {
|
if (size < (int)sizeof(buf)) {
|
||||||
*ptr++ = *str;
|
*ptr++ = *str;
|
||||||
size++;
|
size++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue