Cleanup

src/engine/main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
@@ skipping 127 matching lines @@
       }
       case Communication::PROC_REMOVE_FILTER:
       {
         std::string text;
         request >> text;
         filterEngine->GetFilter(text)->RemoveFromList();
         break;
       }
       case Communication::PROC_SET_PREF:
       {
-        std::string prefName = "";
-        std::string prefValue = "";

[Wladimir Palant, 2013/07/11 12:53:10]

Please don't initialize these variables, their initial value is ignored and
overwritten below.

+        std::string prefName;
         request >> prefName;
-        request >> prefValue;

[Wladimir Palant, 2013/07/11 12:53:10]

These lines can be merged:

request >> prefName >> prefValue;

-        filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));

[Wladimir Palant, 2013/07/11 12:53:10]

What about preferences with non-string values? This needs to support strings,
numbers (int64) and booleans to ensure type safety. The preference you are
actually setting is a boolean.

How about sending Communication::ValueType::TYPE_STRING,
Communication::ValueType::TYPE_INT64 or Communication::ValueType::TYPE_BOOL to
indicate the value type? Same in PROC_GET_PREF of course.

Unfortunately, CAdblockPlusClient will need multiple versions of GetPref/SetPref
functions then.

+
+        Communication::ValueType valueType = request.GetType();
+        switch (valueType)
+        {
+        case Communication::TYPE_STRING:
+          {
+            std::string prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        case Communication::TYPE_INT64:
+          {
+            int64_t prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        case Communication::TYPE_INT32:
+          {
+            int prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        case Communication::TYPE_BOOL:
+          {
+            bool prefValue;
+            request >> prefValue;
+            filterEngine->SetPref(prefName, filterEngine->GetJsEngine()->NewValue(prefValue));
+            break;
+          }
+        default:
+          break;
+        }
         break;
       }
       case Communication::PROC_GET_PREF:
       {
         std::string name;
         request >> name;
 
         AdblockPlus::JsValuePtr valuePtr = filterEngine->GetPref(name);
-        if ((valuePtr->IsNull()) || (!valuePtr->IsString()))

[Wladimir Palant, 2013/07/11 12:53:10]

I think checking valuePtr->IsString() is sufficient - if it is a string then it
definitely isn't null. See also UndefinedValue and NullValue tests for the
JsValue class.

-          response << 0;

[Wladimir Palant, 2013/07/11 12:53:10]

Please don't use an integer as a boolean, this should be << false (and << true
below of course).

+        if (valuePtr->IsNull() || valuePtr->IsUndefined())
+        {
+          // Report no success
+          response << false;
+          break;
+        }
+
+        
+        if (valuePtr->IsBool())
+        {
+          response << true;
+          response << valuePtr->AsBool();
+        }
+        else if (valuePtr->IsNumber())
+        {
+          response << true;
+          response << valuePtr->AsInt();
+        }
+        else if (valuePtr->IsString())
+        {
+          response << true;
+          response << valuePtr->AsString();
+        }
         else
         {
-          response << 1;
-          response << valuePtr->AsString();

[Wladimir Palant, 2013/07/11 12:53:10]

These two lines can be merged:

  response << true << valuePtr->AsString();

+          // Report failure
+          response << false;
         }
         break;
       }
 
     }
     return response;
   }
 
   DWORD WINAPI ClientThread(LPVOID param)
   {
@@ skipping 95 matching lines @@
     }
     catch (std::runtime_error e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }