Fixed some Intel C Compiler warnings

MartinPulec · MartinPulec · commit 5e89b60d7772 · 2012-07-31T16:56:04.000+02:00
Note that only GCC-compatible ICC mode can be used (see Mantis bug #177)
diff --git a/configure.ac b/configure.ac
@@ -372,7 +372,7 @@ case "$host_os" in
                 # -fpermissive, but not in conjunction with -Werror since warnings are still
                 # generated.  Could pull local headers through:
                 #			 's/^\(extern\) \([[A-Za-z0-9]]*($\)/\1 int \2/'
-                if test $x11_cv_broken_headers = yes -a $GCC = "yes" ; then
+                if test $x11_cv_broken_headers = yes -a "$GCC" = "yes" ; then
                         SAVED_X_CFLAGS=$X_CFLAGS
                         X_CFLAGS=`echo $X_CFLAGS | sed 's%-I%-istdinc%'`
                         AC_CACHE_CHECK(whether -istdinc fixes X11 headers, x11_cv_gcc_istdinc_works, [
diff --git a/dxt_compress/dxt_encoder.c b/dxt_compress/dxt_encoder.c
@@ -132,9 +132,9 @@ struct dxt_encoder
 #endif
 };
 
-int dxt_prepare_yuv422_shader(struct dxt_encoder *encoder);
+static int dxt_prepare_yuv422_shader(struct dxt_encoder *encoder);
 
-int dxt_prepare_yuv422_shader(struct dxt_encoder *encoder) {
+static int dxt_prepare_yuv422_shader(struct dxt_encoder *encoder) {
         encoder->yuv422_to_444_fp = 0;    
         if(encoder->legacy) {
             encoder->yuv422_to_444_fp = dxt_shader_create_from_source(fp_yuv422_to_yuv_444_legacy, GL_FRAGMENT_SHADER);
diff --git a/dxt_compress/dxt_util.h b/dxt_compress/dxt_util.h
@@ -55,12 +55,12 @@ extern void glutMainLoopEvent(void);
 
 static inline int dxt_get_size(int width, int height, enum dxt_type format)
 {
+    assert( format == DXT_TYPE_DXT5_YCOCG || format == DXT_TYPE_DXT1 ||  format == DXT_TYPE_DXT1_YUV );
+
     if ( format == DXT_TYPE_DXT5_YCOCG )
         return ((width + 3) / 4 * 4) * ((height + 3) / 4 * 4);
-    else if ( format == DXT_TYPE_DXT1 ||  format == DXT_TYPE_DXT1_YUV )
-        return ((width + 3) / 4 * 4) * ((height + 3) / 4 * 4) / 2;
     else
-            abort();
+        return ((width + 3) / 4 * 4) * ((height + 3) / 4 * 4) / 2;
 }
 
 /**
diff --git a/src/audio/audio.c b/src/audio/audio.c
@@ -114,8 +114,6 @@ struct state_audio {
  * 
  * Input and output data may overlap. 
  */
-void copy_channel(char *out, const char *in, int bps, int in_len /* bytes */, int out_channel_count); 
-
 typedef void (*audio_device_help_t)(void);
 
 static void *audio_sender_thread(void *arg);
diff --git a/src/audio/capture/alsa.c b/src/audio/capture/alsa.c
@@ -52,6 +52,7 @@
 #ifdef HAVE_ALSA
 
 #include "audio/audio.h"
+#include "audio/playback/alsa.h"
 #include "audio/utils.h"
 
 #include "audio/capture/alsa.h" 
@@ -72,7 +73,6 @@ struct state_alsa_capture {
         unsigned int min_device_channels;
 };
 
-void audio_play_alsa_help(const char *driver_name);
 void audio_cap_alsa_help(const char *driver_name)
 {
         audio_play_alsa_help(driver_name);
diff --git a/src/audio/playback/portaudio.c b/src/audio/playback/portaudio.c
@@ -83,12 +83,10 @@ enum audio_device_kind {
  */
 
 /* prototyping */
-void portaudio_decode_frame(void *dst, void *src, int data_len, int buffer_len, void *state);
 static void      print_device_info(PaDeviceIndex device);
 static int       portaudio_start_stream(PaStream *stream);
 static void      portaudio_close(PaStream *stream);  /* closes and frees all audio resources ( according to valgrind this is not true..  ) */
 static void      portaudio_print_available_devices(enum audio_device_kind);
-void             free_audio_frame(audio_frame *buffer);
 
  /*
   * Shared functions
diff --git a/src/glx_common.c b/src/glx_common.c
@@ -222,6 +222,15 @@ void *glx_init(glx_opengl_version_t version)
     };
  
   int glx_major, glx_minor;
+
+  int fbcount;
+  int best_fbc = -1, worst_fbc = -1, best_num_samp = -1, worst_num_samp = 999;
+  GLXFBConfig *fbc;
+  GLXFBConfig bestFbc;
+  XVisualInfo *vi;
+  const char *glxExts;
+  glXCreateContextAttribsARBProc glXCreateContextAttribsARB;
+  int (*oldHandler)(Display*, XErrorEvent*);
  
   // FBConfigs were added in GLX version 1.3.
   if ( !glXQueryVersion( display, &glx_major, &glx_minor ) || 
@@ -232,8 +241,7 @@ void *glx_init(glx_opengl_version_t version)
   }
  
   printf( "Getting matching framebuffer configs\n" );
-  int fbcount;
-  GLXFBConfig *fbc = glXChooseFBConfig( display, DefaultScreen( display ), 
+  fbc = glXChooseFBConfig( display, DefaultScreen( display ), 
                                         visual_attribs, &fbcount );
   if ( !fbc )
   {
@@ -244,10 +252,8 @@ void *glx_init(glx_opengl_version_t version)
  
   // Pick the FB config/visual with the most samples per pixel
   printf( "Getting XVisualInfos\n" );
-  int best_fbc = -1, worst_fbc = -1, best_num_samp = -1, worst_num_samp = 999;
  
-  int i;
-  for ( i = 0; i < fbcount; i++ )
+  for ( int i = 0; i < fbcount; i++ )
   {
     XVisualInfo *vi = glXGetVisualFromFBConfig( display, fbc[i] );
     if ( vi )
@@ -268,13 +274,13 @@ void *glx_init(glx_opengl_version_t version)
     XFree( vi );
   }
  
-  GLXFBConfig bestFbc = fbc[ best_fbc ];
+  bestFbc = fbc[ best_fbc ];
  
   // Be sure to free the FBConfig list allocated by glXChooseFBConfig()
   XFree( fbc );
  
   // Get a visual
-  XVisualInfo *vi = glXGetVisualFromFBConfig( display, bestFbc );
+  vi = glXGetVisualFromFBConfig( display, bestFbc );
   printf( "Chosen visual ID = 0x%x\n", (unsigned int) vi->visualid );
  
   printf( "Creating colormap\n" );
@@ -309,12 +315,12 @@ void *glx_init(glx_opengl_version_t version)
   XMapWindow( display, win );*/
  
   // Get the default screen's GLX extension list
-  const char *glxExts = glXQueryExtensionsString( display,
+  glxExts = glXQueryExtensionsString( display,
                                                   DefaultScreen( display ) );
  
   // NOTE: It is not necessary to create or make current to a context before
   // calling glXGetProcAddressARB
-  glXCreateContextAttribsARBProc glXCreateContextAttribsARB = 0;
+  glXCreateContextAttribsARB = 0;
   glXCreateContextAttribsARB = (glXCreateContextAttribsARBProc)
            glXGetProcAddressARB( (const GLubyte *) "glXCreateContextAttribsARB" );
  
@@ -327,8 +333,7 @@ void *glx_init(glx_opengl_version_t version)
   // of a process use the same error handler, so be sure to guard against other
   // threads issuing X commands while this code is running.
   ctxErrorOccurred = FALSE;
-  int (*oldHandler)(Display*, XErrorEvent*) =
-      XSetErrorHandler(&ctxErrorHandler);
+  oldHandler = XSetErrorHandler(&ctxErrorHandler);
  
   // Check for the GLX_ARB_create_context extension string and the function.
   // If either is not present, use GLX 1.3 context creation method.
diff --git a/src/host.h b/src/host.h
@@ -65,4 +65,9 @@ extern unsigned int audio_capture_channels;
 
 extern unsigned int cuda_device;
 
+// for aggregate.c
+struct display *initialize_video_display(const char *requested_display,
+                                                char *fmt, unsigned int flags);
+struct vidcap *initialize_video_capture(const char *requested_capture,
+                                               char *fmt, unsigned int flags);
 #endif
diff --git a/src/ihdtv/ihdtv.c b/src/ihdtv/ihdtv.c
@@ -66,8 +66,6 @@
 #include "ihdtv.h"
 #include "debug.h"
 
-void init_reciever(void);
-
 int
 ihdtv_init_rx_session(ihdtv_connection * connection, const char *address_1,
                       const char *address_2, unsigned int port1,
diff --git a/src/main.c b/src/main.c
@@ -61,6 +61,7 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 #include "debug.h"
+#include "host.h"
 #include "perf.h"
 #include "rtp/decoders.h"
 #include "rtp/rtp.h"
@@ -179,12 +180,8 @@ static struct rtp **initialize_network(char *addrs, int recv_port_base,
                 int send_port_base, struct pdb *participants, bool use_ipv6,
                 char *mcast_if);
 
-void list_video_display_devices(void);
-void list_video_capture_devices(void);
-struct display *initialize_video_display(const char *requested_display,
-                                                char *fmt, unsigned int flags);
-struct vidcap *initialize_video_capture(const char *requested_capture,
-                                               char *fmt, unsigned int flags);
+static void list_video_display_devices(void);
+static void list_video_capture_devices(void);
 static void sender_finish(struct state_uv *uv);
 static void display_buf_increase_warning(int size);
 
@@ -197,9 +194,9 @@ static void signal_handler(int signal)
 }
 #endif                          /* WIN32 */
 
-void _exit_uv(int status);
+static void _exit_uv(int status);
 
-void _exit_uv(int status) {
+static void _exit_uv(int status) {
         exit_status = status;
         wait_to_finish = TRUE;
         should_exit = TRUE;
@@ -299,7 +296,7 @@ static void usage(void)
         printf("\n");
 }
 
-void list_video_display_devices()
+static void list_video_display_devices()
 {
         int i;
         display_type_t *dt;
@@ -353,7 +350,7 @@ struct display *initialize_video_display(const char *requested_display,
         return d;
 }
 
-void list_video_capture_devices()
+static void list_video_capture_devices()
 {
         int i;
         struct vidcap_type *vt;
diff --git a/src/rtp/decoders.c b/src/rtp/decoders.c
@@ -59,10 +59,12 @@
 
 struct state_decoder;
 
-struct video_frame * reconfigure_decoder(struct state_decoder * const decoder, struct video_desc desc,
+static struct video_frame * reconfigure_decoder(struct state_decoder * const decoder, struct video_desc desc,
                                 struct video_frame *frame);
 typedef void (*change_il_t)(char *dst, char *src, int linesize, int height);
-void restrict_returned_codecs(codec_t *display_codecs, size_t *display_codecs_count, codec_t *pp_codecs, int pp_codecs_count);
+static void restrict_returned_codecs(codec_t *display_codecs,
+                size_t *display_codecs_count, codec_t *pp_codecs,
+                int pp_codecs_count);
 static void decoder_set_video_mode(struct state_decoder *decoder, unsigned int video_mode);
 static int check_for_mode_change(struct state_decoder *decoder, video_payload_hdr_t *hdr, struct video_frame **frame,
                 struct pbuf_video_data *pbuf_data);
@@ -207,7 +209,9 @@ struct state_decoder *decoder_init(char *requested_mode, char *postprocess)
         return s;
 }
 
-void restrict_returned_codecs(codec_t *display_codecs, size_t *display_codecs_count, codec_t *pp_codecs, int pp_codecs_count)
+static void restrict_returned_codecs(codec_t *display_codecs,
+                size_t *display_codecs_count, codec_t *pp_codecs,
+                int pp_codecs_count)
 {
         int i;
 
@@ -458,12 +462,12 @@ static change_il_t select_il_func(enum interlacing_t in_il, enum interlacing_t *
         return NULL;
 }
 
-struct video_frame * reconfigure_decoder(struct state_decoder * const decoder, struct video_desc desc,
-                                struct video_frame *frame_display)
+static struct video_frame * reconfigure_decoder(struct state_decoder * const decoder,
+                struct video_desc desc, struct video_frame *frame_display)
 {
         codec_t out_codec, in_codec;
         decoder_t decode_line;
-        enum interlacing_t display_il = 0;
+        enum interlacing_t display_il = PROGRESSIVE;
         //struct video_frame *frame;
         int render_mode;
 
diff --git a/src/rtp/rtp.h b/src/rtp/rtp.h
@@ -60,6 +60,11 @@ struct rtp;
  * struct *'s. */
 typedef struct rtp *rtp_t;
 
+/*
+ * TODO: this usage of bit-array is incorrect and the attribute "packed"
+ * doesn't ensure proper behaviour. With GCC-incompatible mode of Intel
+ * C Compiler this is broken.
+ */
 typedef struct __attribute__((packed)) {
 	/* The following are pointers to the data in the packet as    */
 	/* it came off the wire. The packet it read in such that the  */
diff --git a/src/rtp/rtp_callback.c b/src/rtp/rtp_callback.c
@@ -203,6 +203,7 @@ void rtp_recv_callback(struct rtp *session, rtp_event * e)
                 if (pckt_rtp->data_len > 0) {   /* Only process packets that contain data... */
                         pbuf_insert(state->playout_buffer, pckt_rtp);
                 }
+                gettimeofday(&curr_time, NULL);
                 tfrc_recv_data(state->tfrc_state, curr_time, pckt_rtp->seq,
                                pckt_rtp->data_len + 40);
                 break;
@@ -226,8 +227,8 @@ void rtp_recv_callback(struct rtp *session, rtp_event * e)
         case RX_APP:
                 pckt_app = (rtcp_app *) e->data;
                 if (strncmp(pckt_app->name, "RTT_", 4) == 0) {
-                        assert(pckt_app->length = 3);
-                        assert(pckt_app->subtype = 0);
+                        assert(pckt_app->length == 3);
+                        assert(pckt_app->subtype == 0);
                         gettimeofday(&curr_time, NULL);
 //                      tfrc_recv_rtt(state->tfrc_state, curr_time, ntohl(*((int *) pckt_app->data)));
                 }
diff --git a/src/transmit.c b/src/transmit.c
@@ -92,7 +92,7 @@ enum fec_scheme_t {
 static bool fec_is_ldgm(struct tx *tx);
 static void tx_update(struct tx *tx, struct tile *tile);
 
-void
+static void
 tx_send_base(struct tx *tx, struct tile *tile, struct rtp *rtp_session,
                 uint32_t ts, int send_m,
                 codec_t color_spec, double input_fps,
@@ -243,7 +243,7 @@ tx_send_tile(struct tx *tx, struct video_frame *frame, int pos, struct rtp *rtp_
         tx_send_base(tx, tile, rtp_session, ts, TRUE, frame->color_spec, frame->fps, frame->interlacing, pos);
 }
 
-void
+static void
 tx_send_base(struct tx *tx, struct tile *tile, struct rtp *rtp_session,
                 uint32_t ts, int send_m,
                 codec_t color_spec, double input_fps,
@@ -350,6 +350,7 @@ tx_send_base(struct tx *tx, struct tile *tile, struct rtp *rtp_session,
                         ldgm_hdr.offset = htonl(pos);
                 }
 
+
                 data = data_to_send + pos;
                 data_len = tx->mtu - hdrs_len;
                 data_len = (data_len / 48) * 48;
diff --git a/src/video_capture/aggregate.c b/src/video_capture/aggregate.c
@@ -64,14 +64,10 @@
 #include "video_display.h"
 #include "video.h"
 
-/* defined in main.c */
-struct vidcap *initialize_video_capture(const char *requested_capture,
-                                               char *fmt, unsigned int flags);
-
 /* prototypes of functions defined in this module */
-void show_help(void);
+static void show_help(void);
 
-void show_help()
+static void show_help()
 {
         printf("Aggregate capture\n");
         printf("Usage\n");
diff --git a/src/video_capture/screen.c b/src/video_capture/screen.c
@@ -129,7 +129,7 @@ pthread_once_t initialized = PTHREAD_ONCE_INIT;
 
 static void initialize() {
         struct vidcap_screen_state *s = (struct vidcap_screen_state *) state;
-
+        const char *vendor;
 
 #ifndef HAVE_MACOSX
         XWindowAttributes        xattr;
@@ -191,7 +191,7 @@ static void initialize() {
         glViewport(0, 0, state->tile->width, state->tile->height);
         glDisable(GL_DEPTH_TEST);
 
-        const char *vendor = (const char *) glGetString(GL_VENDOR);
+        vendor = (const char *) glGetString(GL_VENDOR);
         if(strcmp(vendor, "Tungsten Graphics, Inc") == 0) {
                 fprintf(stderr, "[screen capture] Intel graphic card detected, switching to Xlib screen capture.\n");
                 s->nogl = true;
diff --git a/src/video_capture/testcard.c b/src/video_capture/testcard.c
diff --git a/src/video_codec.c b/src/video_codec.c
diff --git a/src/video_compress.c b/src/video_compress.c
diff --git a/src/video_compress/fastdxt.c b/src/video_compress/fastdxt.c
diff --git a/src/video_display/aggregate.c b/src/video_display/aggregate.c
diff --git a/src/video_display/gl.c b/src/video_display/gl.c
diff --git a/src/video_display/sdl.c b/src/video_display/sdl.c
diff --git a/src/x11_common.c b/src/x11_common.c

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ extern void glutMainLoopEvent(void);`
`55`	`55`
`56`	`56`	`static inline int dxt_get_size(int width, int height, enum dxt_type format)`
`57`	`57`	`{`
	`58`	`+ assert( format == DXT_TYPE_DXT5_YCOCG \|\| format == DXT_TYPE_DXT1 \|\| format == DXT_TYPE_DXT1_YUV );`
	`59`	`+`
`58`	`60`	`if ( format == DXT_TYPE_DXT5_YCOCG )`
`59`	`61`	`return ((width + 3) / 4 * 4) * ((height + 3) / 4 * 4);`
`60`		`- else if ( format == DXT_TYPE_DXT1 \|\| format == DXT_TYPE_DXT1_YUV )`
`61`		`- return ((width + 3) / 4 * 4) * ((height + 3) / 4 * 4) / 2;`
`62`	`62`	`else`
`63`		`- abort();`
	`63`	`+ return ((width + 3) / 4 * 4) * ((height + 3) / 4 * 4) / 2;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,6 @@ struct state_audio {`
`114`	`114`	`*`
`115`	`115`	`* Input and output data may overlap.`
`116`	`116`	`*/`
`117`		`-void copy_channel(char out, const char in, int bps, int in_len /* bytes */, int out_channel_count);`
`118`		`-`
`119`	`117`	`typedef void (*audio_device_help_t)(void);`
`120`	`118`
`121`	`119`	`static void audio_sender_thread(void arg);`