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 172 matching lines @@
           break;
         }
         break;
       }
       case Communication::PROC_GET_PREF:
       {
         std::string name;
         request >> name;
 
         AdblockPlus::JsValuePtr valuePtr = filterEngine->GetPref(name);
         if (valuePtr->IsNull() || valuePtr->IsUndefined())

[Wladimir Palant, 2013/07/26 16:45:37]

valuePtr->IsNull() will be true for undefined as well, so checking IsUndefined()
as well is unnecessary. Actually, the entire block is unnecessary - null and
undefined will result in false for IsBool(), IsNumber() and IsString() (see
JsValue unit test), we can just treat them like any unknown type.

[Oleksandr, 2013/08/05 23:11:01]

This was addressed in:
https://hg.adblockplus.org/adblockplusie/rev/8908c2f7d176

 On 2013/07/26 16:45:37, Wladimir Palant wrote:

         {
           // Report no success
           response << false;
           break;
         }
 
         
         if (valuePtr->IsBool())
         {
+          response << true;
           response << valuePtr->AsBool();
+        }
+        else if (valuePtr->IsNumber())
+        {
           response << true;

[Wladimir Palant, 2013/07/26 16:45:37]

I don't get this, shouldn't you first write success and only then the value you
are sending? Should be:

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

And similarly below.

-        }
-        else if (valuePtr->IsNumber())
-        {
           response << valuePtr->AsInt();
+        }
+        else if (valuePtr->IsString())
+        {
           response << true;
-        }
-        else if (valuePtr->IsString())
-        {
           response << valuePtr->AsString();
-          response << true;
         }
         else
         {
           // Report failure
           response << false;
         }
         break;
       }
 
     }
@@ skipping 100 matching lines @@
     }
     catch (std::runtime_error e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }