diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-09-08 23:46:23 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-09-08 23:46:23 +0200 |
| commit | f5046759cdd72daf5ba3b31c9dfc7b8d5be6bc9b (patch) | |
| tree | b179f9d8d43310bfb8ef85a60d096d1d7ff98760 /src/pulse | |
| parent | b2606cf641f01f688dcb05abcfef3ba003e74efb (diff) | |
llvm-clang-analyzer: drop a few unnecessary assignments and other trivial fixes
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/utf8.c | 4 | ||||
| -rw-r--r-- | src/pulse/volume.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/pulse/utf8.c b/src/pulse/utf8.c index 6b58bde3..9dddf4a3 100644 --- a/src/pulse/utf8.c +++ b/src/pulse/utf8.c @@ -120,10 +120,8 @@ static char* utf8_validate(const char *str, char *output) { size = 4; min = (1 << 16); val = (uint32_t) (*p & 0x07); - } else { - size = 1; + } else goto error; - } p++; if (!is_continuation_char(*p)) diff --git a/src/pulse/volume.c b/src/pulse/volume.c index 47bccad2..2d2bba25 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -155,7 +155,7 @@ pa_volume_t pa_cvolume_min(const pa_cvolume *a) { pa_volume_t pa_cvolume_max_mask(const pa_cvolume *a, const pa_channel_map *cm, pa_channel_position_mask_t mask) { pa_volume_t m = PA_VOLUME_MUTED; - unsigned c, n; + unsigned c; pa_assert(a); @@ -164,7 +164,7 @@ pa_volume_t pa_cvolume_max_mask(const pa_cvolume *a, const pa_channel_map *cm, p pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(a, cm), PA_VOLUME_MUTED); - for (c = n = 0; c < a->channels; c++) { + for (c = 0; c < a->channels; c++) { if (!(PA_CHANNEL_POSITION_MASK(cm->map[c]) & mask)) continue; @@ -178,7 +178,7 @@ pa_volume_t pa_cvolume_max_mask(const pa_cvolume *a, const pa_channel_map *cm, p pa_volume_t pa_cvolume_min_mask(const pa_cvolume *a, const pa_channel_map *cm, pa_channel_position_mask_t mask) { pa_volume_t m = PA_VOLUME_MAX; - unsigned c, n; + unsigned c; pa_assert(a); @@ -187,7 +187,7 @@ pa_volume_t pa_cvolume_min_mask(const pa_cvolume *a, const pa_channel_map *cm, p pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(a, cm), PA_VOLUME_MUTED); - for (c = n = 0; c < a->channels; c++) { + for (c = 0; c < a->channels; c++) { if (!(PA_CHANNEL_POSITION_MASK(cm->map[c]) & mask)) continue; |