Fixed bug fail ostree_object_test

Signed-off-by: Zee314159 <[email protected]>

src/sota_tools/ostree_object.cc

@@ -22,7 +22,6 @@ OSTreeObject::OSTreeObject(const OSTreeRepo &repo, const std::string &object_nam
       refcount_(0),
       is_on_server_(PresenceOnServer::kObjectStateUnknown),
       curl_handle_(nullptr),
-      form_post_(nullptr),
       headers_(nullptr) {
   if (!boost::filesystem::is_regular_file(file_path_)) {
     throw std::runtime_error(file_path_.native() + " is not a valid OSTree repo.");
@@ -240,7 +239,7 @@ void OSTreeObject::Upload(const TreehubServer &push_target, CURLM *curl_multi_ha
   FILE *fd;
   struct stat file_info {};
   fd = fopen(file_path_.c_str(), "rb");
-  if (!fd) {
+  if (fd == nullptr) {
     LOG_ERROR << "Could not open file: " << file_path_.c_str();
     return;
   } else {
@@ -330,8 +329,6 @@ void OSTreeObject::CurlDone(CURLM *curl_multi_handle, RequestPool &pool) {
     }
 
   } else if (current_operation_ == CurrentOp::kOstreeObjectUploading) {
-    curl_formfree(form_post_);
-    form_post_ = nullptr;
     // Sanity-check the handle's URL to make sure it contains the expected
     // object hash.
     if (url == nullptr || strstr(url, object_name_.c_str()) == nullptr) {

src/sota_tools/ostree_object.h

@@ -110,7 +110,6 @@ class OSTreeObject {
 
   std::stringstream http_response_;
   CURL* curl_handle_;
-  struct curl_httppost* form_post_;
   curl_slist* headers_;
   std::list<parentref> parents_;
   std::list<OSTreeObject::ptr> children_;

src/sota_tools/ostree_object_test.cc

@@ -108,8 +108,6 @@ TEST(OstreeObject, UploadDryRun) {
   EXPECT_EQ(object->is_on_server_, PresenceOnServer::kObjectPresent);
   // This currently does not get reset.
   EXPECT_EQ(object->current_operation_, CurrentOp::kOstreeObjectPresenceCheck);
-  // This should not get allocated.
-  EXPECT_EQ(object->form_post_, nullptr);
 }
 
 /* Detect curl misconfiguration.
@@ -128,10 +126,6 @@ TEST(OstreeObject, UploadFail) {
   object->Upload(push_server, nullptr, RunMode::kDefault);
   EXPECT_EQ(object->is_on_server_, PresenceOnServer::kObjectStateUnknown);
   EXPECT_EQ(object->current_operation_, CurrentOp::kOstreeObjectUploading);
-  // This currently will get allocated and we need to free it.
-  EXPECT_NE(object->form_post_, nullptr);
-  curl_formfree(object->form_post_);
-  object->form_post_ = nullptr;
 }
 
 /* Upload missing OSTree objects to destination repository. */
@@ -184,8 +178,6 @@ TEST(OstreeObject, UploadSuccess) {
       curl_easy_getinfo(h->curl_handle_, CURLINFO_RESPONSE_CODE, &rescode);
       EXPECT_EQ(rescode, 200);
 
-      curl_formfree(h->form_post_);
-      h->form_post_ = nullptr;
       curl_multi_remove_handle(multi, h->curl_handle_);
       curl_easy_cleanup(h->curl_handle_);
       h->curl_handle_ = nullptr;