From: Hannah von Reth <hannah.vonreth@owncloud.com>
Date: Wed, 22 Apr 2020 13:22:03 +0000 (+0200)
Subject: Remove now unneede csync_instruction_str
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~113
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8cbdb4451b45a704b67120e69511b12625387f91;p=nextcloud-desktop.git

Remove now unneede csync_instruction_str
---

diff --git a/src/csync/csync_util.cpp b/src/csync/csync_util.cpp
index fd946bd89..93bf1b36e 100644
--- a/src/csync/csync_util.cpp
+++ b/src/csync/csync_util.cpp
@@ -43,24 +43,6 @@ struct _instr_code_struct {
   enum csync_instructions_e instr_code;
 };
 
-static const _instr_code_struct _instr[] =
-{
-  { "INSTRUCTION_NONE", CSYNC_INSTRUCTION_NONE },
-  { "INSTRUCTION_EVAL", CSYNC_INSTRUCTION_EVAL },
-  { "INSTRUCTION_REMOVE", CSYNC_INSTRUCTION_REMOVE },
-  { "INSTRUCTION_RENAME", CSYNC_INSTRUCTION_RENAME },
-  { "INSTRUCTION_EVAL_RENAME", CSYNC_INSTRUCTION_EVAL_RENAME },
-  { "INSTRUCTION_NEW", CSYNC_INSTRUCTION_NEW },
-  { "INSTRUCTION_CONFLICT", CSYNC_INSTRUCTION_CONFLICT },
-  { "INSTRUCTION_IGNORE", CSYNC_INSTRUCTION_IGNORE },
-  { "INSTRUCTION_SYNC", CSYNC_INSTRUCTION_SYNC },
-  { "INSTRUCTION_STAT_ERR", CSYNC_INSTRUCTION_STAT_ERROR },
-  { "INSTRUCTION_ERROR", CSYNC_INSTRUCTION_ERROR },
-  { "INSTRUCTION_TYPE_CHANGE", CSYNC_INSTRUCTION_TYPE_CHANGE },
-  { "INSTRUCTION_UPDATE_METADATA", CSYNC_INSTRUCTION_UPDATE_METADATA },
-  { nullptr, CSYNC_INSTRUCTION_ERROR }
-};
-
 struct csync_memstat_s {
   int size;
   int resident;
@@ -71,21 +53,6 @@ struct csync_memstat_s {
   int dt;
 };
 
-const char *csync_instruction_str(enum csync_instructions_e instr)
-{
-  int idx = 0;
-
-  while (_instr[idx].instr_str) {
-    if (_instr[idx].instr_code == instr) {
-      return _instr[idx].instr_str;
-    }
-    idx++;
-  }
-
-  return "ERROR!";
-}
-
-
 void csync_memstat_check() {
   int s = 0;
   struct csync_memstat_s m;
diff --git a/src/csync/csync_util.h b/src/csync/csync_util.h
index 0114ed2b4..c71f7c999 100644
--- a/src/csync/csync_util.h
+++ b/src/csync/csync_util.h
@@ -26,8 +26,6 @@
 
 #include "csync.h"
 
-const char OCSYNC_EXPORT *csync_instruction_str(enum csync_instructions_e instr);
-
 void OCSYNC_EXPORT csync_memstat_check();
 
 /* Returns true if we're reasonably certain that hash equality
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 7b403015f..8bedc656a 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -1127,7 +1127,7 @@ void ProcessDirectoryJob::processFileFinalize(
         item->_direction = _dirItem->_direction;
     }
 
-    qCInfo(lcDisco) << "Discovered" << item->_file << csync_instruction_str(item->_instruction) << item->_direction << item->_type;
+    qCInfo(lcDisco) << "Discovered" << item->_file << item->_instruction << item->_direction << item->_type;
 
     if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_SYNC)
         item->_instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index 4524e893c..d9b0065ee 100644
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -190,8 +190,7 @@ public:
         if (_state != NotYetStarted) {
             return false;
         }
-        const char *instruction_str = csync_instruction_str(_item->_instruction);
-        qCInfo(lcPropagator) << "Starting" << instruction_str << "propagation of" << _item->destination() << "by" << this;
+        qCInfo(lcPropagator) << "Starting" << _item->_instruction << "propagation of" << _item->destination() << "by" << this;
 
         _state = Running;
         QMetaObject::invokeMethod(this, "start"); // We could be in a different thread (neon jobs)
diff --git a/src/libsync/propagatedownloadencrypted.cpp b/src/libsync/propagatedownloadencrypted.cpp
index d91a7d351..ffef0dec6 100644
--- a/src/libsync/propagatedownloadencrypted.cpp
+++ b/src/libsync/propagatedownloadencrypted.cpp
@@ -89,8 +89,8 @@ void PropagateDownloadEncrypted::checkFolderId(const QStringList &list)
 
 void PropagateDownloadEncrypted::checkFolderEncryptedMetadata(const QJsonDocument &json)
 {
-  qCDebug(lcPropagateDownloadEncrypted) << "Metadata Received reading" <<
-                                           csync_instruction_str(_item->_instruction) << _item->_file << _item->_encryptedFileName;
+  qCDebug(lcPropagateDownloadEncrypted) << "Metadata Received reading"
+                                        << _item->_instruction << _item->_file << _item->_encryptedFileName;
   const QString filename = _info.fileName();
   auto meta = new FolderMetadata(_propagator->account(), json.toJson(QJsonDocument::Compact));
   const QVector<EncryptedFile> files = meta->files();