diff --git a/ChangeLog b/ChangeLog
index 36757daf0c..866a85fc49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2004-02-02  David Schleef  <ds@schleef.org>
+
+	code cleanup.  Change bzero() to memset().  Remove duplicate ; at ends
+	of lines.
+	* ext/cdparanoia/gstcdparanoia.c: (cdparanoia_event):
+	* ext/flac/gstflactag.c: (gst_flac_tag_chain):
+	* ext/xvid/gstxviddec.c: (gst_xviddec_src_link):
+	* gst-libs/gst/play/play.c: (gst_play_get_sink_element):
+	* gst/ac3parse/gstac3parse.c: (gst_ac3parse_chain):
+	* gst/effectv/gstedge.c: (gst_edgetv_sinkconnect):
+	* gst/effectv/gstvertigo.c: (gst_vertigotv_sinkconnect):
+	* gst/intfloat/float22int.c: (gst_float2_2_int_getcaps),
+	(gst_float2_2_int_link):
+	* gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_chain_subtitle):
+	* gst/rtjpeg/RTjpeg.c: (RTjpeg_init_mcompress):
+	* gst/tcp/gsttcpsink.c: (gst_tcpsink_init_send):
+	* gst/tcp/gsttcpsrc.c: (gst_tcpsrc_init_receive):
+	* gst/udp/gstudpsink.c: (gst_udpsink_init_send):
+	* gst/udp/gstudpsrc.c: (gst_udpsrc_init_receive):
+	* sys/v4l/gstv4lelement.c: (gst_v4lelement_init):
+	* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_set_capture):
+	* testsuite/gst-lint: Add tests for bzero and ;;
+
 2004-02-02  David Schleef  <ds@schleef.org>
 
 	* gst/debug/efence.c: Add fallback if MAP_ANONYMOUS isn't defined.
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index b7db39ec98..1266bcdb4b 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -336,7 +336,7 @@ g_print ("out: %s\n", gst_caps_to_string (vscaps));
     return GST_PAD_LINK_REFUSED;
 
   if (!gst_xviddec_setup(xviddec))
-    return GST_PAD_LINK_REFUSED;;
+    return GST_PAD_LINK_REFUSED;
 
   return GST_PAD_LINK_OK;
 }
diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index 0460890ef1..512b906fa4 100644
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -1106,15 +1106,15 @@ gst_play_get_sink_element (GstPlay *play,
             case GST_PLAY_SINK_TYPE_AUDIO:
               if (has_audio_cap)
                 has_correct_type = TRUE;
-              break;;
+              break;
             case GST_PLAY_SINK_TYPE_VIDEO:
               if (has_video_cap)
                 has_correct_type = TRUE;
-              break;;
+              break;
             case GST_PLAY_SINK_TYPE_ANY:
               if ((has_video_cap) || (has_audio_cap))
                 has_correct_type = TRUE;
-              break;;
+              break;
             default:
               has_correct_type = FALSE;
           }
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index c98d9beed5..1774b13e2f 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -370,7 +370,7 @@ gst_mpeg2subt_chain_subtitle (GstPad *pad, GstData *_data)
   /* deal with partial frame from previous buffer */
   if (mpeg2subt->partialbuf) {
 
-    mpeg2subt->partialbuf = gst_buffer_merge(mpeg2subt->partialbuf, buf);;
+    mpeg2subt->partialbuf = gst_buffer_merge(mpeg2subt->partialbuf, buf);
     /* and the one we received.. */
     gst_buffer_unref(buf);
   }
diff --git a/gst/rtjpeg/RTjpeg.c b/gst/rtjpeg/RTjpeg.c
index e246b6bf15..ab87fcc762 100644
--- a/gst/rtjpeg/RTjpeg.c
+++ b/gst/rtjpeg/RTjpeg.c
@@ -2807,7 +2807,7 @@ void RTjpeg_init_mcompress(void)
   fprintf(stderr, "RTjpeg: Could not allocate memory\n");
   exit(-1);
  }
- bzero(RTjpeg_old, ((4*RTjpeg_width*RTjpeg_height)));
+ memset (RTjpeg_old, 0, ((4*RTjpeg_width*RTjpeg_height)));
 }
 
 #ifdef HAVE_LIBMMX
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 2c644fb7f3..8b3276a68a 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -213,7 +213,7 @@ gst_v4l2src_set_capture (GstV4l2Src          *v4l2src,
 	}
 
 	/* update internal info */
-	return gst_v4l2src_get_capture(v4l2src);;
+	return gst_v4l2src_get_capture(v4l2src);
 }