minor changes

src/brpc/periodic_naming_service.cpp

@@ -54,8 +54,6 @@ int PeriodicNamingService::RunNamingService(
             return -1;
         }
     }
-    CHECK(false);
-    return -1;
 }
 
 } // namespace brpc

src/brpc/server.cpp

@@ -1029,9 +1029,6 @@ int Server::Start(const char* ip_str, PortRange port_range,
 }
 
 int Server::Stop(int timeout_ms) {
-    if (_status != RUNNING) {
-        return -1;
-    }
     if (_status != RUNNING) {
         return -1;
     }
@@ -1375,7 +1372,10 @@ void Server::RemoveMethodsOf(google::protobuf::Service* service) {
             full_name_wo_ns.append(md->name());
             _method_map.erase(full_name_wo_ns);
         }
-
+        if (mp == NULL) {
+            LOG(ERROR) << "Fail to find method=" << md->full_name();
+            continue;
+        }
         if (mp->http_url) {
             butil::StringSplitter at_sp(mp->http_url->c_str(), '@');
             for (; at_sp; ++at_sp) {
@@ -1411,7 +1411,7 @@ void Server::RemoveMethodsOf(google::protobuf::Service* service) {
             delete mp->http_url;
         }
 
-        if (mp != NULL && mp->own_method_status) {
+        if (mp->own_method_status) {
             delete mp->status;
         }
         _method_map.erase(md->full_name());

src/brpc/ts.cpp

@@ -251,7 +251,6 @@ void TsPacket::Reset() {
     _transport_scrambling_control = TS_SCRAMBLED_DISABLED;
     _adaptation_field_control = TS_AF_RESERVED;
     _continuity_counter = 0;
-    _adaptation_field = NULL;
     _payload = NULL;
     _modified = false;
 }