cleanup: silence most of the clang warnings

9 files changed, 17 insertions, 16 deletions

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 2bc9ccbf10..b3b0ab91c3 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -529,11 +529,11 @@ const m_option_t common_opts[] = {
 
     OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0),
 
-    { "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-    { "rawvideo", &demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+    { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+    { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 
 #ifdef CONFIG_CDDA
-    { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+    { "cdda", (void *)&cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 
     // demuxer.c - select audio/sub file/demuxer
diff --git a/input/input.c b/input/input.c
index 94c15f42bb..14d31775b0 100644
--- a/input/input.c
+++ b/input/input.c
@@ -646,7 +646,7 @@ static const m_option_t input_conf[] = {
 };
 
 static const m_option_t mp_input_opts[] = {
-    { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+    { "input", (void *)&input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
     OPT_MAKE_FLAGS("joystick", input.use_joystick, CONF_GLOBAL),
     OPT_MAKE_FLAGS("lirc", input.use_lirc, CONF_GLOBAL),
     OPT_MAKE_FLAGS("lircc", input.use_lircc, CONF_GLOBAL),
@@ -1487,7 +1487,7 @@ int mp_input_get_key_from_name(const char *name)
 {
     int modifiers = 0;
     const char *p;
-    while (p = strchr(name, '+')) {
+    while ((p = strchr(name, '+'))) {
         for (struct mp_key_name *m = modifier_names; m->name; m++)
             if (!bstrcasecmp(BSTR(m->name), (struct bstr){(char *)name, p - name})) {
                 modifiers |= m->key;
diff --git a/libaf/format.c b/libaf/format.c
index 56766d2a2e..5d77eabeea 100644
--- a/libaf/format.c
+++ b/libaf/format.c
@@ -123,7 +123,7 @@ char* af_fmt2str(int format, char* str, int size)
     case(AF_FORMAT_IMA_ADPCM):
       i+=snprintf(&str[i],size-i,"IMA-ADPCM "); break;
     default:
-      i+=snprintf(&str[i],size-i,mp_gtext("unknown format "));
+      i+=snprintf(&str[i],size-i,"%s",mp_gtext("unknown format "));
     }
   }
   else{
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index 5c79774da7..c10fd3e14b 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -468,8 +468,8 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
 	      rlen = read_varlen(&p, segtype, 0);
 
 //	      printf("### rlen=%d   \n",rlen);
-              if (rlen < 0 || rlen > p_end - p) {
-                mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%d\n", rlen);
+              if (rlen > p_end - p) {
+                mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%u\n", rlen);
                 break;
               }
 
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index efda65a14d..0b8c9190a4 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -144,7 +144,7 @@ static void list_formats(void)
 {
     mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n");
     AVInputFormat *fmt = NULL;
-    while (fmt = av_iformat_next(fmt))
+    while ((fmt = av_iformat_next(fmt)))
         mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
 }
 
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 6658e3b796..15c2613dc6 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -1549,7 +1549,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es,
 			return 1;
 		}
 	}
-	else if(((stream_id >= 0xe0) && (stream_id <= 0xef)) || (stream_id == 0xfd && type_from_pmt != UNKNOWN))
+	else if((stream_id >= 0xe0 && stream_id <= 0xef) || (stream_id == 0xfd && type_from_pmt != UNKNOWN))
 	{
 		es->start   = p;
 		es->size    = packet_len;
@@ -1563,7 +1563,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es,
 		mp_msg(MSGT_DEMUX, MSGL_DBG2, "pes_parse2: M2V size %d\n", es->size);
 		return 1;
 	}
-	else if ((stream_id == 0xfa))
+	else if (stream_id == 0xfa)
 	{
 		int l;
 
diff --git a/m_option.h b/m_option.h
index b2f201c712..5fa503f0c7 100644
--- a/m_option.h
+++ b/m_option.h
@@ -515,6 +515,6 @@ int parse_timestring(const char *str, double *time, char endchar);
 #define OPT_SETTINGSLIST(optname, varname, flags, objlist) {optname, NULL, &m_option_type_obj_settings_list, flags, 0, 0, objlist, 1, offsetof(struct MPOpts, varname)}
 #define OPT_AUDIOFORMAT(optname, varname, flags) {optname, NULL, &m_option_type_afmt, flags, 0, 0, NULL, 1, offsetof(struct MPOpts, varname)}
 #define OPT_HELPER_REMOVEPAREN(...) __VA_ARGS__
-#define OPT_CHOICE(optname, varname, flags, choices) {optname, NULL, &m_option_type_choice, flags, 0, 0, &(const struct m_opt_choice_alternatives[]){OPT_HELPER_REMOVEPAREN choices, {NULL}}, 1, offsetof(struct MPOpts, varname)}
+#define OPT_CHOICE(optname, varname, flags, choices) {optname, NULL, &m_option_type_choice, flags, 0, 0, (void *)&(const struct m_opt_choice_alternatives[]){OPT_HELPER_REMOVEPAREN choices, {NULL}}, 1, offsetof(struct MPOpts, varname)}
 
 #endif /* MPLAYER_M_OPTION_H */
diff --git a/mplayer.c b/mplayer.c
index 414f3c9023..2180fd8026 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2248,7 +2248,7 @@ static void mp_dvdnav_reset_stream (MPContext *ctx) {
         /// free audio packets and reset
         ds_free_packs(ctx->d_audio);
         audio_delay -= ctx->sh_audio->stream_delay;
-        ctx->delay =- audio_delay;
+        ctx->delay = -audio_delay;
         ao_reset(ctx->ao);
         resync_audio_stream(ctx->sh_audio);
     }
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index a383f0d75d..f7bd0cc5ba 100644
--- a/stream/realrtsp/real.c
+++ b/stream/realrtsp/real.c
@@ -614,9 +614,10 @@ autherr:
       convert_timestamp(str, &e_ss, &e_ms);
       free(str);
     }
-    str = buf + sprintf(buf, s_ms ? "%s%d.%d-" : "%s%d-", "Range: npt=", s_ss, s_ms);
-    if (e_ss || e_ms)
-      sprintf(str, e_ms ? "%d.%d" : "%d", e_ss, e_ms);
+    if (s_ms) str = buf + sprintf(buf, "%s%d.%d-", "Range: npt=", s_ss, s_ms);
+    else      str = buf + sprintf(buf, "%s%d-"   , "Range: npt=", s_ss      );
+    if      (e_ms) sprintf(str, "%d.%d", e_ss, e_ms);
+    else if (e_ss) sprintf(str, "%d",    e_ss      );
   }
   rtsp_schedule_field(rtsp_session, buf);
   /* and finally send a play request */