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 582a716a6b27932920859f846fc3d33d6c050e87..b62449005459a07a806ff391f7e35b95bb0dbeec 100644 (file)
--- 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 957862196bb8da58e3ac630b94173ffd2a5aed28..dadfcdccc8544134b365aeb881ce299841c9efc6 100644 (file)
--- 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;