Bug 1218816 - Remove useless semicolons. Found by coccinelle. r=Ehsan

--HG--
extra : rebase_source : 7d2cc56b6553cd7a8d848d3c660f30735bd82eec
This commit is contained in:
Sylvestre Ledru 2016-01-22 16:58:49 +01:00
parent fefdfab323
commit ab4e3a0d42
47 changed files with 74 additions and 74 deletions

View File

@ -677,7 +677,7 @@ getRoleCB(AtkObject *aAtkObj)
#include "RoleMap.h"
default:
MOZ_CRASH("Unknown role.");
};
}
#undef ROLE

View File

@ -251,7 +251,7 @@ ia2Accessible::role(long* aRole)
#include "RoleMap.h"
default:
MOZ_CRASH("Unknown role.");
};
}
#undef ROLE

View File

@ -452,7 +452,7 @@ AccessibleWrap::get_accRole(
#include "RoleMap.h"
default:
MOZ_CRASH("Unknown role.");
};
}
#undef ROLE

View File

@ -346,7 +346,7 @@ xpcAccessible::GetBounds(int32_t* aX, int32_t* aY,
*aX = rect.x;
*aY = rect.y;
*aWidth = rect.width;
*aHeight = rect.height;;
*aHeight = rect.height;
return NS_OK;
}

View File

@ -11043,7 +11043,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
fireMozStorageChanged = mLocalStorage == changingStorage;
if (fireMozStorageChanged) {
eventType.AssignLiteral("MozLocalStorageChanged");
};
}
break;
}
default:

View File

@ -1437,7 +1437,7 @@ nsObjectLoadingContent::ObjectState() const
case eFallbackVulnerableNoUpdate:
return NS_EVENT_STATE_VULNERABLE_NO_UPDATE;
}
};
}
NS_NOTREACHED("unknown type?");
return NS_EVENT_STATE_LOADING;
}
@ -2422,7 +2422,7 @@ nsObjectLoadingContent::LoadObject(bool aNotify,
case eType_Null:
// Handled below, silence compiler warnings
break;
};
}
//
// Loaded, handle notifications and fallback

View File

@ -1256,7 +1256,7 @@ MatchByVaryHeader(mozIStorageConnection* aConn,
ErrorResult errorResult;
cachedHeaders->Append(name, value, errorResult);
if (errorResult.Failed()) { return errorResult.StealNSResult(); };
if (errorResult.Failed()) { return errorResult.StealNSResult(); }
}
if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }

View File

@ -140,7 +140,7 @@ void MurmurHash3_x86_32 ( const void * key, int len,
case 2: k1 ^= tail[1] << 8;
case 1: k1 ^= tail[0];
k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
};
}
//----------
// finalization
@ -233,7 +233,7 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
case 2: k1 ^= tail[ 1] << 8;
case 1: k1 ^= tail[ 0] << 0;
k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
};
}
//----------
// finalization
@ -318,7 +318,7 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
case 2: k1 ^= uint64_t(tail[ 1]) << 8;
case 1: k1 ^= uint64_t(tail[ 0]) << 0;
k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
};
}
//----------
// finalization

View File

@ -192,7 +192,7 @@ GetDirectoryListingTask::Work()
NS_FAILED(currFile->IsSpecial(&isSpecial))) ||
isLink || isSpecial) {
continue;
};
}
if (NS_WARN_IF(NS_FAILED(currFile->IsFile(&isFile)) ||
NS_FAILED(currFile->IsDirectory(&isDir))) ||
!(isFile || isDir)) {

View File

@ -1804,7 +1804,7 @@ ContentChild::SendPMobileConnectionConstructor(PMobileConnectionChild* aActor,
static_cast<MobileConnectionChild*>(aActor)->AddRef();
return PContentChild::SendPMobileConnectionConstructor(aActor, aClientId);
#else
MOZ_CRASH("No support for mobileconnection on this platform!");;
MOZ_CRASH("No support for mobileconnection on this platform!");
#endif
}
@ -1815,7 +1815,7 @@ ContentChild::AllocPMobileConnectionChild(const uint32_t& aClientId)
MOZ_CRASH("No one should be allocating PMobileConnectionChild actors");
return nullptr;
#else
MOZ_CRASH("No support for mobileconnection on this platform!");;
MOZ_CRASH("No support for mobileconnection on this platform!");
#endif
}

View File

@ -1448,7 +1448,7 @@ bool SkeletonState::DecodeFisbone(ogg_packet* aPacket)
}
msgLength--;
msgProbe++;
};
}
if (!mMsgFieldStore.Contains(serialno)) {
mMsgFieldStore.Put(serialno, field.forget());

View File

@ -91,7 +91,7 @@ public:
int64_t GetMediaTimeUs() override;
// To update progress bar when the element is visible
void SetElementVisibility(bool aIsVisible) override;;
void SetElementVisibility(bool aIsVisible) override;
// Update ready state based on current play state. Not checking data
// availability since offloading is currently done only when whole compressed

View File

@ -72,7 +72,7 @@ TCPServerSocketParent::GetAppId()
} else {
return nsIScriptSecurityManager::UNKNOWN_APP_ID;
}
};
}
bool
TCPServerSocketParent::GetInBrowser()
@ -113,7 +113,7 @@ TCPServerSocketParent::SendCallbackAccept(TCPSocketParent *socket)
}
else {
NS_ERROR("Sending data from PTCPSocketParent was failed.");
};
}
}
else {
NS_ERROR("The member value for NeckoParent is wrong.");

View File

@ -135,7 +135,7 @@ BrowserStreamParent::RecvNPN_DestroyStream(const NPReason& reason)
default:
NS_ERROR("Unexpected state");
return false;
};
}
mNPP->mNPNIface->destroystream(mNPP->mNPP, mStream, reason);
return true;

View File

@ -1177,7 +1177,7 @@ nsHTMLEditor::CollapseSelectionToDeepestNonTableFirstChild(
break;
}
node = child;
};
}
selection->Collapse(node, 0);
}
@ -2703,7 +2703,7 @@ nsHTMLEditor::SetHTMLBackgroundColor(const nsAString& aColor)
if (NS_FAILED(res)) break;
GetNextSelectedCell(nullptr, getter_AddRefs(cell));
};
}
return res;
}
}

View File

@ -259,7 +259,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMNode** aRowNode)
NS_ENSURE_SUCCESS(res, res);
tableChild = nextChild;
};
}
// If here, row was not found
return NS_EDITOR_ELEMENT_NOT_FOUND;
}
@ -360,7 +360,7 @@ nsHTMLEditor::GetLastCellInRow(nsIDOMNode* aRowNode, nsIDOMNode** aCellNode)
NS_ENSURE_SUCCESS(res, res);
rowChild = previousChild;
};
}
if (rowChild)
{
*aCellNode = rowChild.get();

View File

@ -79,7 +79,7 @@ nsTransactionStack::Clear()
{
while (!mDeque.empty()) {
RefPtr<nsTransactionItem> tx = mType == FOR_UNDO ? Pop() : PopBottom();
};
}
}
void

View File

@ -186,7 +186,7 @@ nsWebBrowserFind::FindNext(bool* aResult)
if (curItem.get() == startingItem.get()) {
doFind = true; // start looking in frames after this one
}
};
}
if (!mWrapFind) {
// remember where we left off

View File

@ -144,7 +144,7 @@ gssInit()
libSpec.type = PR_LibSpec_Pathname;
libSpec.value.pathname = verLibNames[i];
lib = PR_LoadLibraryWithFlags(libSpec, PR_LD_GLOBAL);
};
}
#else

View File

@ -1403,7 +1403,7 @@ gfxFontFamily::CheckForSimpleFamily()
// already checked this family
if (mIsSimpleFamily) {
return;
};
}
uint32_t count = mAvailableFonts.Length();
if (count > 4 || count == 0) {

View File

@ -1150,7 +1150,7 @@ GetFMBandSettings(FMRadioCountry aCountry) {
default:
MOZ_ASSERT(0);
break;
};
}
return settings;
}

View File

@ -1198,7 +1198,7 @@ MarkBailoutFrame(JSTracer* trc, const JitFrameIterator& frame)
if (!snapIter.moreInstructions())
break;
snapIter.nextInstruction();
};
}
}

View File

@ -4068,7 +4068,7 @@ LIRGenerator::visitSimdUnbox(MSimdUnbox* ins)
break;
default:
MOZ_CRASH("Unexpected SIMD Type.");
};
}
LSimdUnbox* lir = new(alloc()) LSimdUnbox(in, temp());
assignSnapshot(lir, kind);

View File

@ -3327,7 +3327,7 @@ IonBuilder::canInlineSimd(CallInfo& callInfo, JSNative native, unsigned numArgs,
JSObject* templateObject = inspector->getTemplateObjectForNative(pc, native);
if (!templateObject)
return false;;
return false;
*templateObj = &templateObject->as<InlineTypedObject>();
return true;

View File

@ -281,7 +281,7 @@ SimInstruction::isForbiddenInBranchDelay() const
break;
default:
return false;
};
}
}
bool
@ -446,7 +446,7 @@ SimInstruction::instructionType() const
return kJumpType;
default:
return kUnsupported;
};
}
return kUnsupported;
}
@ -2231,7 +2231,7 @@ Simulator::configureTypeRegister(SimInstruction* instr,
break;
default:
MOZ_CRASH();
};
}
break;
case op_cop1x:
break;
@ -2367,7 +2367,7 @@ Simulator::configureTypeRegister(SimInstruction* instr,
break;
default:
MOZ_CRASH();
};
}
break;
case op_special2:
switch (instr->functionFieldRaw()) {
@ -2379,7 +2379,7 @@ Simulator::configureTypeRegister(SimInstruction* instr,
break;
default:
MOZ_CRASH();
};
}
break;
case op_special3:
switch (instr->functionFieldRaw()) {
@ -2405,11 +2405,11 @@ Simulator::configureTypeRegister(SimInstruction* instr,
}
default:
MOZ_CRASH();
};
}
break;
default:
MOZ_CRASH();
};
}
}
void
@ -2775,7 +2775,7 @@ Simulator::decodeTypeRegister(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
break;
case rs_l:
switch (instr->functionFieldRaw()) {
@ -2797,7 +2797,7 @@ Simulator::decodeTypeRegister(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
break;
case op_cop1x:
switch (instr->functionFieldRaw()) {
@ -2817,7 +2817,7 @@ Simulator::decodeTypeRegister(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
break;
case op_special:
switch (instr->functionFieldRaw()) {
@ -2897,7 +2897,7 @@ Simulator::decodeTypeRegister(SimInstruction* instr)
break;
default: // For other special opcodes we do the default operation.
setRegister(rd_reg, alu_out);
};
}
break;
case op_special2:
switch (instr->functionFieldRaw()) {
@ -2923,14 +2923,14 @@ Simulator::decodeTypeRegister(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
break;
// Unimplemented opcodes raised an error in the configuration step before,
// so we can use the default here to set the destination register in common
// cases.
default:
setRegister(rd_reg, alu_out);
};
}
}
// Type 2: instructions using a 16 bytes immediate. (e.g. addi, beq).
@ -2992,7 +2992,7 @@ Simulator::decodeTypeImmediate(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
break;
// ------------- op_regimm class.
case op_regimm:
@ -3011,7 +3011,7 @@ Simulator::decodeTypeImmediate(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
switch (instr->rtFieldRaw()) {
case rt_bltz:
case rt_bltzal:
@ -3030,7 +3030,7 @@ Simulator::decodeTypeImmediate(SimInstruction* instr)
}
default:
break;
};
}
break; // case op_regimm.
// ------------- Branch instructions.
// When comparing to zero, the encoding of rt field is always 0, so we don't
@ -3163,7 +3163,7 @@ Simulator::decodeTypeImmediate(SimInstruction* instr)
break;
default:
MOZ_CRASH();
};
}
// ---------- Raise exceptions triggered.
signalExceptions();
@ -3239,7 +3239,7 @@ Simulator::decodeTypeImmediate(SimInstruction* instr)
break;
default:
break;
};
}
if (execute_branch_delay_instruction) {

View File

@ -9470,7 +9470,7 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
const nsFrameList& kids1 = !lists1.IsDone() ? lists1.CurrentList() : nsFrameList();
const nsFrameList& kids2 = !lists2.IsDone() ? lists2.CurrentList() : nsFrameList();
int32_t l1 = kids1.GetLength();
int32_t l2 = kids2.GetLength();;
int32_t l2 = kids2.GetLength();
if (l1 != l2) {
ok = false;
LogVerifyMessage(kids1.FirstChild(), kids2.FirstChild(),

View File

@ -1427,7 +1427,7 @@ static void GetProfileTimelineSubDocShells(nsDocShell* aRootDocShell,
}
aShells.AppendElement(shell);
};
}
}
static void

View File

@ -2777,14 +2777,14 @@ nsFrameSelection::AddCellsToSelection(nsIContent *aTableContent,
col ++;
else
col--;
};
}
if (row == aEndRowIndex) break;
if (aStartRowIndex < aEndRowIndex)
row++;
else
row--;
};
}
return result;
}

View File

@ -7530,7 +7530,7 @@ nsTableFrame::InvalidateTableFrame(nsIFrame* aFrame,
aOrigVisualOverflow.Size() != visualOverflow.Size()){
aFrame->InvalidateFrameWithRect(aOrigVisualOverflow);
aFrame->InvalidateFrame();
parent->InvalidateFrameWithRect(aOrigRect);;
parent->InvalidateFrameWithRect(aOrigRect);
parent->InvalidateFrame();
}
}

View File

@ -205,7 +205,7 @@ STDMETHODIMP CExtractCallbackImp::PrepareOperation(Int32 askExtractMode)
case NArchive::NExtract::NAskMode::kExtract:
_extractMode = true;
break;
};
}
return S_OK;
}

View File

@ -1147,7 +1147,7 @@ nsNSSCertificate::ExportAsCMS(uint32_t chainMode,
break;
default:
return NS_ERROR_INVALID_ARG;
};
}
ScopedNSSCMSMessage cmsg(NSS_CMSMessage_Create(nullptr));
if (!cmsg) {

View File

@ -55,7 +55,7 @@ void* AllocateNearTo(void* source, size_t size) {
// Try 100 MB higher.
base = reinterpret_cast<char*>(base) + 100 * 0x100000;
};
}
if (attempts == 41)
return NULL;

View File

@ -666,7 +666,7 @@ PendingLookup::StartLookup()
nsresult rv = DoLookupInternal();
if (NS_FAILED(rv)) {
return OnComplete(false, NS_OK);
};
}
return rv;
}

View File

@ -480,7 +480,7 @@ NativeFileWatcherIOTask::RunInternal()
}
rawNotificationBuffer += notificationInfo->NextEntryOffset;
};
}
// We need to keep watching for further changes.
nsresult rv = AddDirectoryToWatchList(changedRes);

View File

@ -2349,7 +2349,7 @@ TelemetryImpl::CreateHistogramSnapshots(JSContext *cx,
DebugOnly<nsresult> rv = GetHistogramByEnumId(Telemetry::ID(i), &h);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}
};
}
StatisticsRecorder::Histograms hs;
StatisticsRecorder::GetHistograms(&hs);

View File

@ -641,7 +641,7 @@ int main(int argc, char** argv)
paramName.str("");
paramName << "MOZ_CRASHREPORTER_RESTART_ARG_" << i++;
param = getenv(paramName.str().c_str());
};
}
// allow override of the server url via environment variable
//XXX: remove this in the far future when our robot

View File

@ -139,7 +139,7 @@ CreateSourceEvent(SourceEventType aType)
#include "SourceEventTypeMap.h"
default:
MOZ_CRASH("Unknown SourceEvent.");
};
}
#undef CREATE_SOURCE_EVENT_NAME
// Log a fake dispatch and start for this source event.

View File

@ -155,7 +155,7 @@ GetPrefNameForFeature(int32_t aFeature)
break;
default:
break;
};
}
return name;
}

View File

@ -398,7 +398,7 @@ GonkDisplayJB::NotifyBootAnimationStopped()
void
GonkDisplayJB::PowerOnDisplay(int aDpy)
{
MOZ_ASSERT(mHwc);;
MOZ_ASSERT(mHwc);
#if ANDROID_VERSION >= 21
if (mHwc->common.version >= HWC_DEVICE_API_VERSION_1_4) {
mHwc->setPowerMode(mHwc, aDpy, HWC_POWER_MODE_NORMAL);

View File

@ -363,7 +363,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
#else
case eColorID_threeddarkshadow:
// Hardcode to black
aColor = NS_RGB(0x00,0x00,0x00);;
aColor = NS_RGB(0x00,0x00,0x00);
break;
case eColorID__moz_eventreerow:

View File

@ -811,7 +811,7 @@ WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
case kWindowsUnknown:
default:
return DRIVER_OS_UNKNOWN;
};
}
}
const nsTArray<GfxDriverInfo>&

View File

@ -216,7 +216,7 @@ HRESULT InkCollectorEvent::Invoke(DISPID aDispIdMember, REFIID /*aRiid*/,
}
break;
}
};
}
return S_OK;
}

View File

@ -6306,7 +6306,7 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS* wp)
default:
MOZ_LOG(gWindowsLog, LogLevel::Info, ("*** mSizeMode: ??????\n"));
break;
};
}
#endif
if (mWidgetListener)

View File

@ -383,7 +383,7 @@ nsConsoleService::GetMessageArray(uint32_t* aCount,
nsCOMPtr<nsIConsoleMessage> m = e->Get();
m.forget(&messageArray[i]);
i++;
};
}
MOZ_ASSERT(i == mCurrentSize);

View File

@ -324,7 +324,7 @@ NS_DebugBreak(uint32_t aSeverity, const char* aStr, const char* aExpr,
default:
aSeverity = NS_DEBUG_WARNING;
};
}
# define PrintToBuffer(...) PR_sxprintf(StuffFixedBuffer, &buf, __VA_ARGS__)

View File

@ -522,7 +522,7 @@ nsAString::AppendInt(int aInt, int32_t aRadix)
default:
NS_ERROR("Unrecognized radix");
fmt = "";
};
}
char buf[20];
int len = snprintf(buf, sizeof(buf), fmt, aInt);
@ -1002,7 +1002,7 @@ nsACString::AppendInt(int aInt, int32_t aRadix)
default:
NS_ERROR("Unrecognized radix");
fmt = "";
};
}
char buf[20];
int len = snprintf(buf, sizeof(buf), fmt, aInt);

View File

@ -199,7 +199,7 @@ nsStorageStream::Write(const char* aBuffer, uint32_t aCount,
mWriteCursor += count;
LOG(("nsStorageStream [%p] Writing mWriteCursor=%x mSegmentEnd=%x count=%d\n",
this, mWriteCursor, mSegmentEnd, count));
};
}
out:
*aNumWritten = aCount - remaining;
@ -476,7 +476,7 @@ nsStorageInputStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
remainingCapacity -= bytesConsumed;
mReadCursor += bytesConsumed;
mLogicalCursor += bytesConsumed;
};
}
out:
*aNumRead = aCount - remainingCapacity;