Merge pull request xbmc#5158 from topfs2/drop_libyajl_1_x

Dropped libyajl 1.x

xbmc/network/TCPServer.h

@@ -22,6 +22,7 @@
 #include <vector>
 #include <sys/socket.h>
 
+#include "system.h"
 #include "interfaces/json-rpc/IClient.h"
 #include "interfaces/json-rpc/IJSONRPCAnnouncer.h"
 #include "interfaces/json-rpc/ITransportLayer.h"

xbmc/system.h

@@ -120,7 +120,6 @@
 #define HAS_LIBRTMP
 #define HAVE_LIBBLURAY
 #define HAS_ASAP_CODEC
-#define HAVE_YAJL_YAJL_VERSION_H
 #define HAS_FILESYSTEM_SMB
 #define HAS_FILESYSTEM_NFS
 #define HAS_ZEROCONF

xbmc/utils/JSONVariantParser.cpp

@@ -38,27 +38,17 @@ CJSONVariantParser::CJSONVariantParser(IParseCallback *callback)
 {
   m_callback = callback;
 
-#if YAJL_MAJOR == 2
   m_handler = yajl_alloc(&callbacks, NULL, this);
 
   yajl_config(m_handler, yajl_allow_comments, 1);
   yajl_config(m_handler, yajl_dont_validate_strings, 0);
-#else
-  yajl_parser_config cfg = { 1, 1 };
-
-  m_handler = yajl_alloc(&callbacks, &cfg, NULL, this);
-#endif
 
   m_status = ParseVariable;
 }
 
 CJSONVariantParser::~CJSONVariantParser()
 {
-#if YAJL_MAJOR == 2
   yajl_complete_parse(m_handler);
-#else
-  yajl_parse_complete(m_handler);
-#endif
   yajl_free(m_handler);
 }
 
@@ -97,11 +87,7 @@ int CJSONVariantParser::ParseBoolean(void * ctx, int boolean)
   return 1;
 }
 
-#if YAJL_MAJOR ==2
 int CJSONVariantParser::ParseInteger(void * ctx, long long integerVal)
-#else
-int CJSONVariantParser::ParseInteger(void * ctx, long integerVal)
-#endif
 {
   CJSONVariantParser *parser = (CJSONVariantParser *)ctx;
 
@@ -121,11 +107,7 @@ int CJSONVariantParser::ParseDouble(void * ctx, double doubleVal)
   return 1;
 }
 
-#if YAJL_MAJOR == 2
 int CJSONVariantParser::ParseString(void * ctx, const unsigned char * stringVal, size_t stringLen)
-#else
-int CJSONVariantParser::ParseString(void * ctx, const unsigned char * stringVal, unsigned int stringLen)
-#endif
 {
   CJSONVariantParser *parser = (CJSONVariantParser *)ctx;
 
@@ -144,11 +126,7 @@ int CJSONVariantParser::ParseMapStart(void * ctx)
   return 1;
 }
 
-#if YAJL_MAJOR == 2
 int CJSONVariantParser::ParseMapKey(void * ctx, const unsigned char * stringVal, size_t stringLen)
-#else
-int CJSONVariantParser::ParseMapKey(void * ctx, const unsigned char * stringVal, unsigned int stringLen)
-#endif
 {
   CJSONVariantParser *parser = (CJSONVariantParser *)ctx;
 

xbmc/utils/JSONVariantParser.h

@@ -19,14 +19,10 @@
  *
  */
 
-#include "system.h"
 #include "Variant.h"
 
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_gen.h>
-#ifdef HAVE_YAJL_YAJL_VERSION_H
-#include <yajl/yajl_version.h>
-#endif
 
 class IParseCallback
 {
@@ -59,23 +55,11 @@ class CJSONVariantParser
 private:
   static int ParseNull(void * ctx);
   static int ParseBoolean(void * ctx, int boolean);
-#if YAJL_MAJOR == 2
   static int ParseInteger(void * ctx, long long integerVal);
-#else
-  static int ParseInteger(void * ctx, long integerVal);
-#endif
   static int ParseDouble(void * ctx, double doubleVal);
-#if YAJL_MAJOR == 2
   static int ParseString(void * ctx, const unsigned char * stringVal, size_t stringLen);
-#else
-  static int ParseString(void * ctx, const unsigned char * stringVal, unsigned int stringLen);
-#endif
   static int ParseMapStart(void * ctx);
-#if YAJL_MAJOR == 2
   static int ParseMapKey(void * ctx, const unsigned char * stringVal, size_t stringLen);
-#else
-  static int ParseMapKey(void * ctx, const unsigned char * stringVal, unsigned int stringLen);
-#endif
   static int ParseMapEnd(void * ctx);
   static int ParseArrayStart(void * ctx);
   static int ParseArrayEnd(void * ctx);

xbmc/utils/JSONVariantWriter.cpp

@@ -28,14 +28,9 @@ string CJSONVariantWriter::Write(const CVariant &value, bool compact)
 {
   string output;
 
-#if YAJL_MAJOR == 2
   yajl_gen g = yajl_gen_alloc(NULL);
   yajl_gen_config(g, yajl_gen_beautify, compact ? 0 : 1);
   yajl_gen_config(g, yajl_gen_indent_string, "\t");
-#else
-  yajl_gen_config conf = { compact ? 0 : 1, "\t" };
-  yajl_gen g = yajl_gen_alloc(&conf, NULL);
-#endif
 
   // Set locale to classic ("C") to ensure valid JSON numbers
   const char *currentLocale = setlocale(LC_NUMERIC, NULL);
@@ -50,13 +45,8 @@ string CJSONVariantWriter::Write(const CVariant &value, bool compact)
   {
     const unsigned char * buffer;
 
-#if YAJL_MAJOR == 2
     size_t length;
     yajl_gen_get_buf(g, &buffer, &length);
-#else
-    unsigned int length;
-    yajl_gen_get_buf(g, &buffer, &length);
-#endif
     output = string((const char *)buffer, length);
   }
 
@@ -77,18 +67,10 @@ bool CJSONVariantWriter::InternalWrite(yajl_gen g, const CVariant &value)
   switch (value.type())
   {
   case CVariant::VariantTypeInteger:
-#if YAJL_MAJOR == 2
     success = yajl_gen_status_ok == yajl_gen_integer(g, (long long int)value.asInteger());
-#else
-    success = yajl_gen_status_ok == yajl_gen_integer(g, (long int)value.asInteger());
-#endif
     break;
   case CVariant::VariantTypeUnsignedInteger:
-#if YAJL_MAJOR == 2
     success = yajl_gen_status_ok == yajl_gen_integer(g, (long long int)value.asUnsignedInteger());
-#else
-    success = yajl_gen_status_ok == yajl_gen_integer(g, (long int)value.asUnsignedInteger());
-#endif
     break;
   case CVariant::VariantTypeDouble:
     success = yajl_gen_status_ok == yajl_gen_double(g, value.asDouble());
@@ -97,11 +79,7 @@ bool CJSONVariantWriter::InternalWrite(yajl_gen g, const CVariant &value)
     success = yajl_gen_status_ok == yajl_gen_bool(g, value.asBoolean() ? 1 : 0);
     break;
   case CVariant::VariantTypeString:
-#if YAJL_MAJOR == 2
     success = yajl_gen_status_ok == yajl_gen_string(g, (const unsigned char*)value.c_str(), (size_t)value.size());
-#else
-    success = yajl_gen_status_ok == yajl_gen_string(g, (const unsigned char*)value.c_str(), value.size());
-#endif
     break;
   case CVariant::VariantTypeArray:
     success = yajl_gen_status_ok == yajl_gen_array_open(g);
@@ -118,11 +96,7 @@ bool CJSONVariantWriter::InternalWrite(yajl_gen g, const CVariant &value)
 
     for (CVariant::const_iterator_map itr = value.begin_map(); itr != value.end_map() && success; ++itr)
     {
-#if YAJL_MAJOR == 2
       success &= yajl_gen_status_ok == yajl_gen_string(g, (const unsigned char*)itr->first.c_str(), (size_t)itr->first.length());
-#else
-      success &= yajl_gen_status_ok == yajl_gen_string(g, (const unsigned char*)itr->first.c_str(), itr->first.length());
-#endif
       if (success)
         success &= InternalWrite(g, itr->second);
     }

xbmc/utils/JSONVariantWriter.h

@@ -19,12 +19,8 @@
  *
  */
 
-#include "system.h"
 #include "Variant.h"
 #include <yajl/yajl_gen.h>
-#ifdef HAVE_YAJL_YAJL_VERSION_H
-#include <yajl/yajl_version.h>
-#endif
 
 class CJSONVariantWriter
 {