Merge branch '2014_univalue_warn' into merge-PR4715

Merge pull request #4715
This commit is contained in:
Jeff Garzik 2014-08-19 00:49:31 -04:00
commit 0367329549
Failed to extract signature
5 changed files with 344 additions and 20 deletions

2
.gitignore vendored
View File

@ -28,6 +28,8 @@ src/m4/ltsugar.m4
src/m4/ltversion.m4
src/m4/lt~obsolete.m4
src/univalue/gen
src/qt/*.moc
src/qt/moc_*.cpp
src/qt/forms/ui_*.h

View File

@ -185,6 +185,7 @@ univalue_libbitcoin_univalue_a_SOURCES = \
univalue/univalue.cpp \
univalue/univalue_read.cpp \
univalue/univalue_write.cpp \
univalue/univalue_escapes.h \
univalue/univalue.h
# common: shared between bitcoind, and bitcoin-qt and non-server tools

78
src/univalue/gen.cpp Normal file
View File

@ -0,0 +1,78 @@
// Copyright 2014 BitPay Inc.
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
//
// To re-create univalue_escapes.h:
// $ g++ -o gen gen.cpp
// $ ./gen > univalue_escapes.h
//
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include "univalue.h"
using namespace std;
static bool initEscapes;
static const char *escapes[256];
static void initJsonEscape()
{
escapes[(int)'"'] = "\\\"";
escapes[(int)'\\'] = "\\\\";
escapes[(int)'/'] = "\\/";
escapes[(int)'\b'] = "\\b";
escapes[(int)'\f'] = "\\f";
escapes[(int)'\n'] = "\\n";
escapes[(int)'\r'] = "\\r";
escapes[(int)'\t'] = "\\t";
initEscapes = true;
}
static void outputEscape()
{
printf( "// Automatically generated file. Do not modify.\n"
"#ifndef __UNIVALUE_ESCAPES_H__\n"
"#define __UNIVALUE_ESCAPES_H__\n"
"static const char *escapes[256] = {\n");
for (unsigned int i = 0; i < 256; i++) {
if (!escapes[i]) {
printf("\tNULL,\n");
} else {
printf("\t\"");
unsigned int si;
for (si = 0; si < strlen(escapes[i]); si++) {
char ch = escapes[i][si];
switch (ch) {
case '"':
printf("\\\"");
break;
case '\\':
printf("\\\\");
break;
default:
printf("%c", escapes[i][si]);
break;
}
}
printf("\",\n");
}
}
printf( "};\n"
"#endif // __UNIVALUE_ESCAPES_H__\n");
}
int main (int argc, char *argv[])
{
initJsonEscape();
outputEscape();
return 0;
}

View File

@ -0,0 +1,262 @@
// Automatically generated file. Do not modify.
#ifndef __UNIVALUE_ESCAPES_H__
#define __UNIVALUE_ESCAPES_H__
static const char *escapes[256] = {
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
"\\b",
"\\t",
"\\n",
NULL,
"\\f",
"\\r",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
"\\\"",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
"\\/",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
"\\\\",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
};
#endif // __UNIVALUE_ESCAPES_H__

View File

@ -5,33 +5,14 @@
#include <ctype.h>
#include <stdio.h>
#include "univalue.h"
#include "univalue_escapes.h"
// TODO: Using UTF8
using namespace std;
static bool initEscapes;
static const char *escapes[256];
static void initJsonEscape()
{
escapes['"'] = "\\\"";
escapes['\\'] = "\\\\";
escapes['/'] = "\\/";
escapes['\b'] = "\\b";
escapes['\f'] = "\\f";
escapes['\n'] = "\\n";
escapes['\r'] = "\\r";
escapes['\t'] = "\\t";
initEscapes = true;
}
static string json_escape(const string& inS)
{
if (!initEscapes)
initJsonEscape();
string outS;
outS.reserve(inS.size() * 2);