RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 17-May-2015 01:31:18 Branch: rpm-5_4 Handle: 2015051623311701 Modified files: (Branch: rpm-5_4) rpm/rpmio .cvsignore Makefile.am jsmn.c Log: - resurrect the github testcase. Summary: Revision Changes Path 1.41.2.12 +3 -0 rpm/rpmio/.cvsignore 1.293.2.53 +10 -2 rpm/rpmio/Makefile.am 1.1.2.2 +28 -2 rpm/rpmio/jsmn.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/.cvsignore ============================================================================ $ cvs diff -u -r1.41.2.11 -r1.41.2.12 .cvsignore --- rpm/rpmio/.cvsignore 1 May 2015 20:14:40 -0000 1.41.2.11 +++ rpm/rpmio/.cvsignore 16 May 2015 23:31:17 -0000 1.41.2.12 @@ -18,6 +18,7 @@ dumpasn1 gengpg.h getdate.c +github lcov lookup3 bsdiff @@ -53,6 +54,7 @@ tglob thkp tinv +tjsmn tkey tmacro tmagic @@ -72,3 +74,4 @@ tsw ttcl ttpm +twitter @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am ============================================================================ $ cvs diff -u -r1.293.2.52 -r1.293.2.53 Makefile.am --- rpm/rpmio/Makefile.am 16 May 2015 20:56:25 -0000 1.293.2.52 +++ rpm/rpmio/Makefile.am 16 May 2015 23:31:18 -0000 1.293.2.53 @@ -15,7 +15,7 @@ rpmjsio.msg rpmtar.c rpmtar.h \ tdir.c tfts.c tget.c tgfs.c tgit.c tglob.c thkp.c thtml.c tinv.c tkey.c \ tmire.c todbc.c tput.c tpython.c trpmio.c tsexp.c tsvn.c tsw.c \ - lookup3.c jsmn.c tjsmn.c yajl.c testit.sh mongoc-counters.defs + lookup3.c jsmn.c tjsmn.c tjson.c yajl.c testit.sh mongoc-counters.defs EXTRA_PROGRAMS = rpmcpio rpmdpkg rpmtar rpmz EXTRA_PROGRAMS += bdes thtml tinv tkey tmacro tpw @@ -26,7 +26,7 @@ rpmpbzip2 rpmpigz \ tasn tbf tder tdir tfts tget tglob thkp tmagic \ tmire todbc toid tperl tpython tput trpmio tsexp tsvn tsw ttcl \ - dumpasn1 lookup3 trel + dumpasn1 lookup3 trel twitter github noinst_PROGRAMS += b2sum tset tblake2b tblake2bp tblake2s tblake2sp tgfs if WITH_LIBGIT2 @@ -614,3 +614,11 @@ tjsmn_SOURCES = tjsmn.c tjsmn_LDADD = $(RPMIO_LDADD_COMMON) +github_SOURCES = tjson.c +github_CFLAGS = -Wall -Werror -std=gnu99 -O2 -DJSMN_GITHUB +github_LDADD = -lcurl + +twitter_SOURCES = tjson.c +twitter_CFLAGS = -Wall -Werror -std=gnu99 -O2 -DJSMN_TWITTER +twitter_LDADD = -lcurl + @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/jsmn.c ============================================================================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 jsmn.c --- rpm/rpmio/jsmn.c 16 May 2015 20:56:25 -0000 1.1.2.1 +++ rpm/rpmio/jsmn.c 16 May 2015 23:31:18 -0000 1.1.2.2 @@ -1,5 +1,27 @@ #define JSMN_PARENT_LINKS 1 /*==============================================================*/ +/* + * Copyright (c) 2010 Serge A. Zaitsev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +/*==============================================================*/ /* --- jsmn.h */ #ifdef __cplusplus @@ -71,9 +93,13 @@ } #endif -/*==============================================================*//* --- jsmn.c *//** +/*==============================================================*/ +/* --- jsmn.c */ + +/** * Allocates a fresh unused token from the token pull. - */ static jsmntok_t *jsmn_alloc_token(jsmn_parser * parser, + */ +static jsmntok_t *jsmn_alloc_token(jsmn_parser * parser, jsmntok_t * tokens, size_t num_tokens) { @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org