Switch to NOTREACHED_NORETURN() in xfa/fxfa/parser
Switch from NOTREACHED() to NOTREACHED_NORETURN().
Bug: pdfium:2008
Change-Id: Ibc898c147bb18bb0cc1709a119198d6010e89f11
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/109511
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fxfa/parser/cxfa_box.cpp b/xfa/fxfa/parser/cxfa_box.cpp
index 761c7c8..cd644aa 100644
--- a/xfa/fxfa/parser/cxfa_box.cpp
+++ b/xfa/fxfa/parser/cxfa_box.cpp
@@ -207,7 +207,7 @@
} else if (type == XFA_Element::Rectangle || type == XFA_Element::Border) {
ToRectangle(this)->Draw(strokes, pGS, rtWidget, matrix);
} else {
- NOTREACHED();
+ NOTREACHED_NORETURN();
}
}
@@ -237,7 +237,7 @@
} else if (type == XFA_Element::Rectangle || type == XFA_Element::Border) {
ToRectangle(this)->GetFillPath(strokes, rtWidget, &fillPath);
} else {
- NOTREACHED();
+ NOTREACHED_NORETURN();
}
fillPath.Close();
fill->Draw(pGS, fillPath, rtWidget, matrix);
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 70464c4..45c7849 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -1648,8 +1648,7 @@
case XFA_Element::Variables:
return nullptr;
default:
- NOTREACHED();
- return nullptr;
+ NOTREACHED_NORETURN();
}
}
diff --git a/xfa/fxfa/parser/cxfa_document_builder.cpp b/xfa/fxfa/parser/cxfa_document_builder.cpp
index 6fc52b7..c103284 100644
--- a/xfa/fxfa/parser/cxfa_document_builder.cpp
+++ b/xfa/fxfa/parser/cxfa_document_builder.cpp
@@ -170,8 +170,7 @@
break;
}
default:
- NOTREACHED();
- break;
+ NOTREACHED_NORETURN();
}
}
}
diff --git a/xfa/fxfa/parser/cxfa_measurement.cpp b/xfa/fxfa/parser/cxfa_measurement.cpp
index db71075..94675c8 100644
--- a/xfa/fxfa/parser/cxfa_measurement.cpp
+++ b/xfa/fxfa/parser/cxfa_measurement.cpp
@@ -127,8 +127,7 @@
*fValue /= kPtToPc;
return true;
default:
- NOTREACHED();
- return false;
+ NOTREACHED_NORETURN();
}
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index e508136..c97b21c 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -2918,7 +2918,7 @@
widget_type = XFA_FFWidgetType::kTextEdit;
}
} else {
- NOTREACHED();
+ NOTREACHED_NORETURN();
}
if (!pUIChild) {
@@ -2933,8 +2933,7 @@
}
XFA_FFWidgetType CXFA_Node::GetDefaultFFWidgetType() const {
- NOTREACHED();
- return XFA_FFWidgetType::kNone;
+ NOTREACHED_NORETURN();
}
CXFA_Node* CXFA_Node::CreateUINodeIfNeeded(CXFA_Ui* ui, XFA_Element type) {
@@ -2979,7 +2978,7 @@
} else if (type == XFA_Element::ExclGroup) {
ff_widget_type_ = XFA_FFWidgetType::kExclGroup;
} else {
- NOTREACHED();
+ NOTREACHED_NORETURN();
}
return ui_ ? ui_->GetFirstChild() : nullptr;
}
@@ -3710,8 +3709,7 @@
fStartOffset += (fHeight - fTextHeight + fSpaceAbove);
break;
default:
- NOTREACHED();
- break;
+ NOTREACHED_NORETURN();
}
}
if (fStartOffset < 0.1f)
@@ -5096,7 +5094,7 @@
ToXMLText(GetXMLMappingNode())->SetText(value);
break;
default:
- NOTREACHED();
+ NOTREACHED_NORETURN();
}
}
diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp
index 60ac294..c6be5ac 100644
--- a/xfa/fxfa/parser/cxfa_rectangle.cpp
+++ b/xfa/fxfa/parser/cxfa_rectangle.cpp
@@ -303,8 +303,7 @@
StrokeEmbossed(pGS, rtWidget, fThickness, matrix);
break;
default:
- NOTREACHED();
- break;
+ NOTREACHED_NORETURN();
}
return;
}