early return

tools/replay/route.cc

@@ -57,19 +57,22 @@ bool Route::loadFromCommaApi() {
   strptime(route_.timestamp.c_str(), "%Y-%m-%d--%H-%M-%S", &tm_time);
   date_time_ = mktime(&tm_time);
 
-  bool ret = data_dir_.empty() ? loadFromServer() : loadFromLocal();
+  bool load_success = data_dir_.empty() ? loadFromServer() : loadFromLocal();
-  if (ret) {
+  if (!load_success) {
-    if (route_.begin_segment == -1) route_.begin_segment = segments_.rbegin()->first;
+    rInfo("Failed to load route from %s", data_dir_.empty() ? "server" : "local");
-    if (route_.end_segment == -1) route_.end_segment = segments_.rbegin()->first;
+    return false;
-    for (auto it = segments_.begin(); it != segments_.end(); /**/) {
+  }
-      if (it->first < route_.begin_segment || it->first > route_.end_segment) {
+
-        it = segments_.erase(it);
+  if (route_.begin_segment == -1) route_.begin_segment = segments_.rbegin()->first;
-      } else {
+  if (route_.end_segment == -1) route_.end_segment = segments_.rbegin()->first;
-        ++it;
+  for (auto it = segments_.begin(); it != segments_.end(); /**/) {
-      }
+    if (it->first < route_.begin_segment || it->first > route_.end_segment) {
+      it = segments_.erase(it);
+    } else {
+      ++it;
     }
   }
-  return !segments_.empty();
+  return true;
 }
 
 bool Route::loadFromAutoSource() {