Remove double trailing semicolons

Only matching ";;\n", replaced with:

  grep -lIR --include=*.{c,h,cpp,hpp} ";;\$" | xargs sed -i 's/;;\{1,\}$/;/'

modules/access/alsa.c

@@ -258,7 +258,7 @@ static int Control (demux_t *demux, int query, va_list ap)
         case DEMUX_CAN_CONTROL_RATE:
         case DEMUX_CAN_SEEK:
             *va_arg (ap, bool *) = false;
-            break;;
+            break;
 
         default:
             return VLC_EGENERIC;

modules/access/dvb/scan.c

@@ -1551,7 +1551,7 @@ static scan_session_t *scan_session_New( scan_t *p_scan, const scan_tuner_config
     p_session->p_pathandle = NULL;
     p_session->p_sdthandle = NULL;
     p_session->p_nithandle = NULL;
-    return p_session;;
+    return p_session;
 }
 
 static void scan_session_Delete( scan_session_t *p_session )

modules/access/rtp/xiph.c

@@ -122,7 +122,7 @@ static ssize_t xiph_header (void **pextra, const uint8_t *buf, size_t len)
     void *extra;
     int  extra_size;
     if (xiph_PackHeaders (&extra_size, &extra, sizes, payloads, 3))
-        return -1;;
+        return -1;
     *pextra = extra;
     return extra_size;
 }

modules/codec/aom.c

@@ -393,7 +393,7 @@ static int OpenDecoder(vlc_object_t *p_this)
     if (aom_codec_dec_init(&sys->ctx, iface, &deccfg, 0) != AOM_CODEC_OK) {
         AOM_ERR(p_this, &sys->ctx, "Failed to initialize decoder");
         free(sys);
-        return VLC_EGENERIC;;
+        return VLC_EGENERIC;
     }
 
     dec->pf_decode = Decode;

modules/codec/speex.c

@@ -415,7 +415,7 @@ static int ProcessHeaders( decoder_t *p_dec )
                            p_dec->fmt_in->i_extra, p_dec->fmt_in->p_extra) )
         return VLC_EGENERIC;
     if( i_count < 2 )
-        return VLC_EGENERIC;;
+        return VLC_EGENERIC;
 
     oggpacket.granulepos = -1;
     oggpacket.e_o_s = 0;
@@ -428,7 +428,7 @@ static int ProcessHeaders( decoder_t *p_dec )
     if( ProcessInitialHeader( p_dec, &oggpacket ) != VLC_SUCCESS )
     {
         msg_Err( p_dec, "initial Speex header is corrupted" );
-        return VLC_EGENERIC;;
+        return VLC_EGENERIC;
     }
 
     /* The next packet in order is the comments header */

modules/codec/vpx.c

@@ -329,7 +329,7 @@ static int OpenDecoder(vlc_object_t *p_this)
     if (vpx_codec_dec_init(&sys->ctx, iface, &deccfg, 0) != VPX_CODEC_OK) {
         VPX_ERR(p_this, &sys->ctx, "Failed to initialize decoder");
         free(sys);
-        return VLC_EGENERIC;;
+        return VLC_EGENERIC;
     }
 
     dec->pf_decode = Decode;

modules/control/cli/cli.c

@@ -339,7 +339,7 @@ error:      wordfree(&we);
 
         if (pp != NULL)
         {
-            const struct command *c = *pp;;
+            const struct command *c = *pp;
 
             ret = c->handler.callback(cl, args, count, c->data);
         }

modules/control/cli/player.c

@@ -1029,7 +1029,7 @@ static const struct cli_handler cmds[] =
 
 void *RegisterPlayer(intf_thread_t *intf)
 {
-    vlc_playlist_t *playlist = vlc_intf_GetMainPlaylist(intf);;
+    vlc_playlist_t *playlist = vlc_intf_GetMainPlaylist(intf);
     vlc_player_t *player = vlc_playlist_GetPlayer(playlist);
     struct player_cli *pc = malloc(sizeof (*pc));
 
@@ -1069,7 +1069,7 @@ error:
 
 void DeregisterPlayer(intf_thread_t *intf, void *data)
 {
-    vlc_playlist_t *playlist = vlc_intf_GetMainPlaylist(intf);;
+    vlc_playlist_t *playlist = vlc_intf_GetMainPlaylist(intf);
     vlc_player_t *player = vlc_playlist_GetPlayer(playlist);
     struct player_cli *pc = data;
 

modules/demux/mkv/matroska_segment_parse.cpp

@@ -1895,7 +1895,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
                 p_tk->fmt.audio.i_channels   = GetWLE( &p_wf->nChannels );
                 p_tk->fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec );
                 p_tk->fmt.i_bitrate    = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8;
-                p_tk->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );;
+                p_tk->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );
                 p_tk->fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample );
 
                 p_tk->fmt.i_extra            = GetWLE( &p_wf->cbSize );

modules/demux/mpeg/ts_psi.c

@@ -357,7 +357,7 @@ static void ParsePMTPrivateRegistrations( demux_t *p_demux, const dvbpsi_descrip
 static dvbpsi_descriptor_t *PMTEsFindDescriptor( const dvbpsi_pmt_es_t *p_es,
                                                  int i_tag )
 {
-    dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
+    dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
     while( p_dr && ( p_dr->i_tag != i_tag ) )
         p_dr = p_dr->p_next;
     return p_dr;

modules/demux/rawdv.c

@@ -205,7 +205,7 @@ static int Open( vlc_object_t * p_this )
 
     es_format_Init( &p_sys->fmt_video, VIDEO_ES, VLC_CODEC_DV );
     p_sys->fmt_video.video.i_width = 720;
-    p_sys->fmt_video.video.i_height= dv_header.dsf ? 576 : 480;;
+    p_sys->fmt_video.video.i_height= dv_header.dsf ? 576 : 480;
     p_sys->fmt_video.video.i_visible_width = p_sys->fmt_video.video.i_width;
     p_sys->fmt_video.video.i_visible_height = p_sys->fmt_video.video.i_height;
 

modules/gui/qt/maininterface/compositor_common.hpp

@@ -48,7 +48,7 @@ private:
     void render();
 
     QBackingStore* m_backingStore = nullptr;
-    bool m_initialized = false;;
+    bool m_initialized = false;
 };
 
 

modules/gui/qt/maininterface/compositor_dcomp_uisurface.cpp

@@ -216,7 +216,7 @@ bool CompositorDCompositionUISurface::init()
     HR(d3dDevice.As(&m_qtd3dDevice1));
 
     m_uiOffscreenSurface = new QOffscreenSurface();
-    m_uiOffscreenSurface->setFormat(format);;
+    m_uiOffscreenSurface->setFormat(format);
     m_uiOffscreenSurface->create();
 
     m_uiRenderControl = new CompositorDCompositionRenderControl(m_renderWindow);
@@ -793,7 +793,7 @@ QQuickWindow* CompositorDCompositionUISurface::getOffscreenWindow() const {
 
 void CompositorDCompositionUISurface::handleScreenChange()
 {
-    m_uiWindow->setGeometry(0, 0, m_renderWindow->width(), m_renderWindow->height());;
+    m_uiWindow->setGeometry(0, 0, m_renderWindow->width(), m_renderWindow->height());
     requestUpdate();
 }
 

modules/gui/qt/maininterface/mainctx.hpp

@@ -271,7 +271,7 @@ public:
 
     bool hasEmbededVideo() const;
     VideoSurfaceProvider* getVideoSurfaceProvider() const;
-    void setVideoSurfaceProvider(VideoSurfaceProvider* videoSurfaceProvider);;
+    void setVideoSurfaceProvider(VideoSurfaceProvider* videoSurfaceProvider);
 
     Q_INVOKABLE static inline void setCursor(Qt::CursorShape cursor) { QApplication::setOverrideCursor(QCursor(cursor)); };
     Q_INVOKABLE static inline void restoreCursor(void) { QApplication::restoreOverrideCursor(); };

modules/gui/qt/medialibrary/mlalbummodel.cpp

@@ -89,7 +89,7 @@ void MLAlbumModel::onVlcMlEvent(const MLEvent &event)
         case VLC_ML_EVENT_GENRE_DELETED:
             if ( m_parent.id != 0 && m_parent.type == VLC_ML_PARENT_GENRE &&
                  event.deletion.i_entity_id == m_parent.id )
-                    emit resetRequested();;
+                    emit resetRequested();
             return;
         default:
             break;

modules/gui/qt/medialibrary/mlplaylistmodel.cpp

@@ -458,7 +458,7 @@ void MLPlaylistModel::thumbnailUpdated(const QModelIndex& idx, MLItem* mlitem, c
 
 std::vector<std::pair<int, int>> MLPlaylistModel::getSortedRowsRanges(const QModelIndexList & indexes, bool asc) const
 {
-    assert (indexes.size() > 0);;
+    assert (indexes.size() > 0);
 
     QList<int> rows;
     for (const QModelIndex & index : indexes)

modules/gui/qt/widgets/native/csdthemeimage.cpp

@@ -29,7 +29,7 @@ void CSDThemeImage::updateContent()
 
 QSGNode* CSDThemeImage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*)
 {
-    QSGImageNode *imageNode = nullptr;;
+    QSGImageNode *imageNode = nullptr;
     auto w = window();
     if (!m_theme || m_bannerHeight <= 0)
     {

modules/gui/qt/widgets/native/roundimage.cpp

@@ -329,7 +329,7 @@ namespace
 
             assert(provider->imageType() == QQmlImageProviderBase::ImageResponse);
 
-            const auto imageId = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1);;
+            const auto imageId = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1);
 
             if (provider->imageType() == QQmlImageProviderBase::ImageResponse)
             {

modules/gui/skins2/win32/win32_loop.cpp

@@ -305,7 +305,7 @@ LRESULT CALLBACK Win32Loop::processEvent( HWND hwnd, UINT msg,
         default:
             break;
     }
-    return DefWindowProc( hwnd, msg, wParam, lParam );;
+    return DefWindowProc( hwnd, msg, wParam, lParam );
 }
 
 

modules/stream_out/rtpfmt.c

@@ -80,9 +80,9 @@ static int rtp_xiph_pack_headers(size_t room, void *p_extra, size_t i_extra,
 
     if (xiph_SplitHeaders(packet_size, packet, &packet_count,
                                 i_extra, p_extra))
-        return VLC_EGENERIC;;
+        return VLC_EGENERIC;
     if (packet_count < 3)
-        return VLC_EGENERIC;;
+        return VLC_EGENERIC;
 
     if (theora_pixel_fmt != NULL)
     {

modules/stream_out/rtsp.c

@@ -945,7 +945,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
                     bool found = false;
                     for (int i = 0; i < ses->trackc; i++)
                     {
-                        rtsp_strack_t *tr = ses->trackv + i;;
+                        rtsp_strack_t *tr = ses->trackv + i;
                         if (tr->id == id)
                         {
                             if (tr->setup_fd == -1)

modules/stream_out/sdi/SDIOutput.cpp

@@ -45,7 +45,7 @@ SDIOutput::SDIOutput(sout_stream_t *p_stream_)
     video.tenbits = var_InheritBool(p_stream, CFG_PREFIX "tenbits");
     video.nosignal_delay = var_InheritInteger(p_stream, CFG_PREFIX "nosignal-delay");
     video.pic_nosignal = NULL;
-    audio.i_channels = var_InheritInteger(p_stream, CFG_PREFIX "channels");;
+    audio.i_channels = var_InheritInteger(p_stream, CFG_PREFIX "channels");
     audio.b_configured = false;
     ancillary.afd = var_InheritInteger(p_stream, CFG_PREFIX "afd");
     ancillary.ar = var_InheritInteger(p_stream, CFG_PREFIX "ar");

modules/text_renderer/freetype/text_layout.c

@@ -802,7 +802,7 @@ static int ShapeParagraphHarfBuzz( filter_t *p_filter,
         run_desc_t *p_run = p_paragraph->p_runs + i;
         unsigned int i_glyph_count;
         const hb_glyph_info_t *p_infos =
-                hb_buffer_get_glyph_infos( p_run->p_buffer, &i_glyph_count );;
+                hb_buffer_get_glyph_infos( p_run->p_buffer, &i_glyph_count );
         const hb_glyph_position_t *p_positions =
                 hb_buffer_get_glyph_positions( p_run->p_buffer, &i_glyph_count );
         for( unsigned int j = 0; j < i_glyph_count; ++j )

modules/video_output/opengl/interop_dxva2.c

@@ -248,7 +248,7 @@ static void SetupProcessorInput(struct vlc_gl_interop *interop, const video_form
         .right  = interop->fmt_in.i_x_offset + interop->fmt_in.i_visible_width,
         .top    = interop->fmt_in.i_y_offset,
         .bottom = interop->fmt_in.i_y_offset + interop->fmt_in.i_visible_height,
-    };;
+    };
     IDXVAHD_VideoProcessor_SetVideoProcessStreamState( sys->processor.proc, 0, DXVAHD_STREAM_STATE_SOURCE_RECT, sizeof(srcRect), &srcRect );
 
     DXVAHD_BLT_STATE_TARGET_RECT_DATA dstRect;

modules/video_output/win32/direct3d9.c

@@ -1434,7 +1434,7 @@ static void SetupProcessorInput(vout_display_t *vd, const video_format_t *fmt, c
         .right  = vd->source->i_x_offset + vd->source->i_visible_width,
         .top    = vd->source->i_y_offset,
         .bottom = vd->source->i_y_offset + vd->source->i_visible_height,
-    };;
+    };
     IDXVAHD_VideoProcessor_SetVideoProcessStreamState( sys->processor.proc, 0, DXVAHD_STREAM_STATE_SOURCE_RECT, sizeof(srcRect), &srcRect );
 
     DXVAHD_BLT_STATE_TARGET_RECT_DATA dstRect;

modules/video_output/win32/wingdi.c

@@ -253,7 +253,7 @@ static int Init(vout_display_t *vd, video_format_t *fmt)
     if (sys->i_depth > 8) {
         ((DWORD*)bi->bmiColors)[0] = fmt->i_rmask;
         ((DWORD*)bi->bmiColors)[1] = fmt->i_gmask;
-        ((DWORD*)bi->bmiColors)[2] = fmt->i_bmask;;
+        ((DWORD*)bi->bmiColors)[2] = fmt->i_bmask;
     }
 
     BITMAPINFOHEADER *bih = &sys->bitmapinfo.bmiHeader;

src/config/chain.c

@@ -484,6 +484,6 @@ char *config_StringEscape( const char *str )
             *dst++ = '\\';
         *dst++ = *p;
     }
-    *dst = '\0';;
+    *dst = '\0';
     return ret;
 }

src/input/resource.c

@@ -567,7 +567,7 @@ void input_resource_HoldVouts( input_resource_t *p_resource, vout_thread_t ***pp
         goto exit;
 
     *ppp_vout = pp_vout;
-    *pi_vout = count;;
+    *pi_vout = count;
 
     count = 0;
     vlc_list_foreach( vout_rsc, &p_resource->vout_rscs, node )

src/input/vlmshell.c

@@ -500,7 +500,7 @@ static int ExecuteSave( vlm_t *p_vlm, const char *psz_file, vlm_message_t **pp_s
     if( psz_save == NULL )
         goto error;
     if( fputs( psz_save, f ) == EOF )
-        goto error;;
+        goto error;
     if( fclose( f ) )
     {
         f = NULL;

src/misc/mtime.c

@@ -151,6 +151,6 @@ struct timespec *vlc_tick_to_timespec(struct timespec *restrict ts,
     lldiv_t d = lldiv(tick, CLOCK_FREQ);
 
     ts->tv_sec = d.quot;
-    ts->tv_nsec = NS_FROM_VLC_TICK(d.rem);;
+    ts->tv_nsec = NS_FROM_VLC_TICK(d.rem);
     return ts;
 }

test/libvlc/media_list_player.c

@@ -193,7 +193,7 @@ static void test_media_list_player_previous(const char** argv, int argc)
     assert (ml != NULL);
 
     mlp = libvlc_media_list_player_new (vlc);
-    assert(mlp);;
+    assert(mlp);
 
     libvlc_media_list_add_media (ml, md);