From e4be2582bc17e5c7925b61c09d61c0cd90e00b08 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Mon, 2 Feb 2004 20:09:09 +0000 Subject: [PATCH] code cleanup. Change bzero() to memset(). Remove duplicate ; at ends of lines. Original commit message from CVS: 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 ;; --- ChangeLog | 23 +++++++++++++++++++++++ ext/cdparanoia/gstcdparanoia.c | 4 ++-- gst-libs/gst/play/play.c | 6 +++--- gst/tcp/gsttcpsink.c | 2 +- gst/tcp/gsttcpsrc.c | 2 +- sys/v4l/gstv4lelement.c | 2 +- tests/old/testsuite/gst-lint | 24 ++++++++++++++++++++++++ testsuite/gst-lint | 24 ++++++++++++++++++++++++ 8 files changed, 79 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36757daf0c..866a85fc49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2004-02-02 David Schleef + + 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 * gst/debug/efence.c: Add fallback if MAP_ANONYMOUS isn't defined. diff --git a/ext/cdparanoia/gstcdparanoia.c b/ext/cdparanoia/gstcdparanoia.c index 7210f0eaa5..3ae7c36b06 100644 --- a/ext/cdparanoia/gstcdparanoia.c +++ b/ext/cdparanoia/gstcdparanoia.c @@ -863,7 +863,7 @@ cdparanoia_event (GstPad *pad, GstEvent *event) if (paranoia_seek (src->p, seg_start_sector, SEEK_SET) > -1) { GST_DEBUG ("seeked to %" G_GINT64_FORMAT, seg_start_sector); - src->segment_start_sector = seg_start_sector;; + src->segment_start_sector = seg_start_sector; src->cur_sector = src->segment_start_sector; } else { @@ -873,7 +873,7 @@ cdparanoia_event (GstPad *pad, GstEvent *event) if (seg_end_sector != -1) { seg_end_sector = CLAMP (seg_end_sector, src->first_sector, src->last_sector); - src->segment_end_sector = seg_end_sector;; + src->segment_end_sector = seg_end_sector; } GST_DEBUG ("configured for %d -> %d sectors\n", src->segment_start_sector, 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/tcp/gsttcpsink.c b/gst/tcp/gsttcpsink.c index 06e9caa5e2..08f89a4387 100644 --- a/gst/tcp/gsttcpsink.c +++ b/gst/tcp/gsttcpsink.c @@ -342,7 +342,7 @@ gst_tcpsink_init_send (GstTCPSink *sink) struct hostent *he; struct in_addr addr; - bzero (&sink->theiraddr, sizeof (sink->theiraddr)); + memset (&sink->theiraddr, 0, sizeof (sink->theiraddr)); sink->theiraddr.sin_family = AF_INET; /* host byte order */ sink->theiraddr.sin_port = htons (sink->port); /* short, network byte order */ diff --git a/gst/tcp/gsttcpsrc.c b/gst/tcp/gsttcpsrc.c index 6497fcf49c..4cab50d9cc 100644 --- a/gst/tcp/gsttcpsrc.c +++ b/gst/tcp/gsttcpsrc.c @@ -376,7 +376,7 @@ static gboolean gst_tcpsrc_init_receive (GstTCPSrc *src) { guint val=0; - bzero (&src->myaddr, sizeof (src->myaddr)); + memset (&src->myaddr, 0, sizeof (src->myaddr)); src->myaddr.sin_family = AF_INET; /* host byte order */ src->myaddr.sin_port = htons (src->port); /* short, network byte order */ src->myaddr.sin_addr.s_addr = INADDR_ANY; diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c index b2d406d40a..c03a45e2a3 100644 --- a/sys/v4l/gstv4lelement.c +++ b/sys/v4l/gstv4lelement.c @@ -413,7 +413,7 @@ gst_v4lelement_init (GstV4lElement *v4lelement) v4lelement->video_fd = -1; v4lelement->buffer = NULL; v4lelement->videodev = g_strdup ("/dev/video"); - v4lelement->display = g_strdup(g_getenv("DISPLAY"));; + v4lelement->display = g_strdup(g_getenv("DISPLAY")); v4lelement->norms = NULL; v4lelement->channels = NULL; diff --git a/tests/old/testsuite/gst-lint b/tests/old/testsuite/gst-lint index 95c9e1adb7..ce0875124b 100755 --- a/tests/old/testsuite/gst-lint +++ b/tests/old/testsuite/gst-lint @@ -42,6 +42,8 @@ sub check_old_plugin(); sub check_signal_new(); sub check_gnuc_const(); sub check_caps(); +sub check_lib_deprecated(); +sub check_typo(); sub m_check_plugindir(); sub m_check_interfaces(); @@ -65,6 +67,8 @@ foreach $filename () { check_old_typefind(); check_old_plugin(); check_caps(); + check_lib_deprecated(); + check_typo(); # less important stuff @@ -458,3 +462,23 @@ sub check_caps() } } +# +# Check for use of deprecated functions +# +sub check_lib_deprecated() +{ + if (grep { /bzero/ } @lines) { + print "E: change bzero() to memset()\n"; + } +} + +# +# Check for typos +# +sub check_typo() +{ + if (grep { /;\s*;\s*$/ } @lines) { + print "W: typo? \";;\"\n"; + } +} + diff --git a/testsuite/gst-lint b/testsuite/gst-lint index 95c9e1adb7..ce0875124b 100755 --- a/testsuite/gst-lint +++ b/testsuite/gst-lint @@ -42,6 +42,8 @@ sub check_old_plugin(); sub check_signal_new(); sub check_gnuc_const(); sub check_caps(); +sub check_lib_deprecated(); +sub check_typo(); sub m_check_plugindir(); sub m_check_interfaces(); @@ -65,6 +67,8 @@ foreach $filename () { check_old_typefind(); check_old_plugin(); check_caps(); + check_lib_deprecated(); + check_typo(); # less important stuff @@ -458,3 +462,23 @@ sub check_caps() } } +# +# Check for use of deprecated functions +# +sub check_lib_deprecated() +{ + if (grep { /bzero/ } @lines) { + print "E: change bzero() to memset()\n"; + } +} + +# +# Check for typos +# +sub check_typo() +{ + if (grep { /;\s*;\s*$/ } @lines) { + print "W: typo? \";;\"\n"; + } +} +