Remove unnecessary semicolons

A simplified version of the semantic match that finds this problem is
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p

@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

Change-Id: Ib9708d37fbb4c6060f88d5dae3814a2d37b2091e
Reviewed-on: https://gerrit.libreoffice.org/9493
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 24 insertions, 24 deletions

diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 57ff61fc2001..f11425d84da2 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -133,7 +133,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
                 sprintf( buf, "%d.%d\n\n",
                          RSCVERSION_ID / 100, RSCVERSION_ID % 100 );
                 StdLstOut( buf );
-            };
+            }
 
             StdLstOut( "Command line: rsc [Switches] <Source File(s)>\n" );
             StdLstOut( "Command line: rsc @<Command File>\n" );
@@ -382,7 +382,7 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
         ErrorFormat( rError, pClass, aId );
         WriteError( rError, pMessage );
         StdLstErr( "\n" );
-    };
+    }
 }
 
 void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 007f33b8bff4..8d4589824696 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -137,7 +137,7 @@ void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode )
             rtl_freeMemory( pObjNode->GetRscObj() );
         }
         delete pObjNode;
-    };
+    }
 }
 
 void DestroySubTrees( RscTop * pRscTop )
@@ -147,7 +147,7 @@ void DestroySubTrees( RscTop * pRscTop )
         DestroySubTrees( (RscTop*)pRscTop->Left() );
         DestroyNode( pRscTop, pRscTop->GetObjNode() );
         DestroySubTrees( (RscTop*)pRscTop->Right() );
-    };
+    }
 }
 
 void DestroyTree( RscTop * pRscTop )
@@ -158,7 +158,7 @@ void DestroyTree( RscTop * pRscTop )
         DestroyTree( (RscTop*)pRscTop->Right() );
 
         delete pRscTop;
-    };
+    }
 }
 
 void Pre_dtorTree( RscTop * pRscTop )
@@ -169,7 +169,7 @@ void Pre_dtorTree( RscTop * pRscTop )
         Pre_dtorTree( (RscTop*)pRscTop->Right() );
 
         pRscTop->Pre_dtor();
-    };
+    }
 }
 
 RscTypCont :: ~RscTypCont()
@@ -625,7 +625,7 @@ bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
 
         if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop ) )
             bRet = false;
-    };
+    }
 
     return bRet;
 }
@@ -653,7 +653,7 @@ bool MakeConsistent( RscTop * pRscTop )
 
         if( ! ::MakeConsistent( (RscTop*)pRscTop->Right() ) )
             bRet = false;
-    };
+    }
 
     return bRet;
 }
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index 432e1073e580..cd779e3a7928 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.cxx
@@ -66,7 +66,7 @@ void RscNameTable::SetSort( bool bSorted )
         // Schluesselwort Feld sortieren
         qsort( (void *)pTable, nEntries,
                sizeof( KEY_STRUCT ), KeyCompare );
-    };
+    }
 };
 
 Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, long nValue )
@@ -134,15 +134,15 @@ bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle )
             if( pTable[ i ].nName == nName )
                 pKey = &pTable[ i ];
             i++;
-        };
-    };
+        }
+    }
 
     if( pKey )
     {
         // Schluesselwort gefunden
         *pEle = *pKey;
         return true;
-    };
+    }
     return false;
 };
 
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index cfc85a289c04..bcfb796ff18c 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -77,7 +77,7 @@ sal_uInt32 GetNumber()
             nLog = 16;
             c = pFI->GetFastChar();
         }
-    };
+    }
 
     if( nLog == 16 )
     {
@@ -147,7 +147,7 @@ int MakeToken( YYSTYPE * pTokenVal )
         }
         else
             break;
-    };
+    }
 
     // FIXME: wtf is this supposed to do?
     if( (c != 0) == pFI->IsEof() )
@@ -166,11 +166,11 @@ int MakeToken( YYSTYPE * pTokenVal )
             {
                 aBuf.append( sal_Char(c) );
                 c = pFI->GetFastChar();
-            };
+            }
             c = pFI->GetFastChar();
             pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
             return( INCLUDE_STRING );
-        };
+        }
     }
 
     if( c == '"' )
@@ -256,7 +256,7 @@ int MakeToken( YYSTYPE * pTokenVal )
                     bLastInclude = true;
                 default:
                     pTokenVal->value = aKey.yylval;
-                };
+                }
 
                 return aKey.nTyp;
             }
@@ -393,11 +393,11 @@ void IncludeParser( RscFileInst * pFileInst )
                     lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
                                                          OString() );
                     pFName->InsertDependFile( lKey, ULONG_MAX );
-                };
-            };
-        };
+                }
+            }
+        }
         nToken = MakeToken( &aYYSType );
-    };
+    }
 
     EndParser();
 }
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 2d0f496219fd..8f56023d93b0 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -133,8 +133,8 @@ void RscFileInst::GetNewLine()
                     }
                 }
             }
-        };
-    };
+        }
+    }
 
     // Abbruch ueber EOF
     pLine[ nLen ] = '\0';
@@ -158,7 +158,7 @@ void RscFileInst::SetError( ERRTYPE aError )
         aFirstError = aError;
         nErrorLine  = GetLineNo();
         nErrorPos   = GetScanPos() -1;
-    };
+    }
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */