Skip to content

Commit

Permalink
Squashed 'src/univalue/' changes from 7890db9..5a58a46
Browse files Browse the repository at this point in the history
5a58a46 Merge #21: Remove hand-coded UniValue destructor.
b4cdfc4 Remove hand-coded UniValue destructor.
7fba60b Merge #17: [docs] Update readme
4577454 Merge #13: Fix typo
ac7e73c [docs] Update readme
4a49647 Fix typo

git-subtree-dir: src/univalue
git-subtree-split: 5a58a46
  • Loading branch information
MarcoFalke committed Oct 30, 2019
1 parent dc287c9 commit fa0b3da
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 18 deletions.
21 changes: 5 additions & 16 deletions README.md
Expand Up @@ -12,21 +12,10 @@ an arbitrary depth.
This class is aligned with the JSON standard, [RFC
7159](https://tools.ietf.org/html/rfc7159.html).

## Installation
## Library usage

This project is a standard GNU
[autotools](https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html)
project. Build and install instructions are available in the `INSTALL`
file provided with GNU autotools.

```
$ ./autogen.sh
$ ./configure
$ make
```

## Design

UniValue provides a single dynamic RAII C++ object class,
and minimizes template use (contra json_spirit).
This is a fork of univalue used by Bitcoin Core. It is not maintained for usage
by other projects. Notably, the API may break in non-backward-compatible ways.

Other projects looking for a maintained library should use the upstream
univalue at https://github.com/jgarzik/univalue.
1 change: 0 additions & 1 deletion include/univalue.h
Expand Up @@ -47,7 +47,6 @@ class UniValue {
std::string s(val_);
setStr(s);
}
~UniValue() {}

void clear();

Expand Down
2 changes: 1 addition & 1 deletion lib/univalue_get.cpp
Expand Up @@ -35,7 +35,7 @@ bool ParseInt32(const std::string& str, int32_t *out)
errno = 0; // strtol will not set errno if valid
long int n = strtol(str.c_str(), &endp, 10);
if(out) *out = (int32_t)n;
// Note that strtol returns a *long int*, so even if strtol doesn't report a over/underflow
// Note that strtol returns a *long int*, so even if strtol doesn't report an over/underflow
// we still have to check that the returned value is within the range of an *int32_t*. On 64-bit
// platforms the size of these types may be different.
return endp && *endp == 0 && !errno &&
Expand Down

0 comments on commit fa0b3da

Please sign in to comment.