From: José Iván López González <jlopez@suse.com>
Date: Tue, 5 Nov 2019 16:02:36 +0000 (+0000)
Subject: Do not use null for empty json strings
X-Git-Tag: v0.8.6~10^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2759dfd4d11096a00050e63fd54610f084793b07;p=thirdparty%2Fsnapper.git

Do not use null for empty json strings
---

diff --git a/client/Command/ListSnapshots/SnappersData/Json.cc b/client/Command/ListSnapshots/SnappersData/Json.cc
index 582a716a..b6244900 100644
--- a/client/Command/ListSnapshots/SnappersData/Json.cc
+++ b/client/Command/ListSnapshots/SnappersData/Json.cc
@@ -103,14 +103,13 @@ namespace snapper
 		    if (column == Options::Columns::USERDATA)
 			value = userdata_json(snapshot->getUserdata());
 
-		    if (value.empty())
+		    if (!is_json_string(column))
 		    {
-			value = "null";
 			skip_format.push_back(column);
-		    }
 
-		    if (skip_format_value(column))
-			skip_format.push_back(column);
+			if (value.empty())
+			    value = "null";
+		    }
 
 		    snapshot_data.emplace_back(column, value);
 		}
@@ -128,7 +127,7 @@ namespace snapper
 	}
 
 
-	bool Command::ListSnapshots::SnappersData::Json::skip_format_value(const string& column) const
+	bool Command::ListSnapshots::SnappersData::Json::is_json_string(const string& column) const
 	{
 	    if (column == Options::Columns::NUMBER ||
 		column == Options::Columns::DEFAULT ||
@@ -137,9 +136,9 @@ namespace snapper
 		column == Options::Columns::USERDATA ||
 		column == Options::Columns::PRE_NUMBER ||
 		column == Options::Columns::POST_NUMBER)
-		return true;
-	    else
 		return false;
+	    else
+		return true;
 	}
 
 
diff --git a/client/Command/ListSnapshots/SnappersData/Json.h b/client/Command/ListSnapshots/SnappersData/Json.h
index 95786219..dadfcdcc 100644
--- a/client/Command/ListSnapshots/SnappersData/Json.h
+++ b/client/Command/ListSnapshots/SnappersData/Json.h
@@ -49,7 +49,7 @@ namespace snapper
 
 	    std::string snapshot_json(const ProxySnapshot* snapshot) const;
 
-	    bool skip_format_value(const string& column) const;
+	    bool is_json_string(const string& column) const;
 
 	    virtual string boolean_text(bool value) const override;