From f6a6e486ffc38235edc3c1197278c8a505c523eb Mon Sep 17 00:00:00 2001 From: Michael Clark Date: Tue, 13 Mar 2007 08:26:23 +0000 Subject: [PATCH] * Make headers C++ compatible by change *this to *obj * Add ifdef C++ extern "C" to headers * Use simpler definition of min and max in bits.h Larry Lansing, llansing at fuzzynerd dot com * Remove automake 1.6 requirement * Move autogen commands into autogen.sh. Update README * Remove error pointer special case for Windows * Change license from LGPL to MIT Michael Clark git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@10 327403b1-1117-474d-bef2-5cb71233fd97 --- COPYING | 499 ++---------------------------------------- ChangeLog | 12 + Makefile.am | 4 - README | 6 +- README-WIN32.html | 6 +- README.html | 8 +- arraylist.c | 15 +- arraylist.h | 25 +-- autogen.sh | 1 + bits.h | 31 +-- config.h.win32 | 15 +- debug.c | 15 +- debug.h | 15 +- json.h | 23 +- json_object.c | 15 +- json_object.h | 89 ++++---- json_object_private.h | 15 +- json_tokener.c | 15 +- json_tokener.h | 19 +- json_util.c | 15 +- json_util.h | 15 +- linkhash.c | 15 +- linkhash.h | 15 +- printbuf.c | 15 +- printbuf.h | 15 +- test1.c | 3 +- 26 files changed, 165 insertions(+), 756 deletions(-) create mode 100644 autogen.sh diff --git a/COPYING b/COPYING index eb685a5..b07ea94 100644 --- a/COPYING +++ b/COPYING @@ -1,481 +1,18 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! +Copyright (c) 2004, 2005 Metaparadigm Pte Ltd + +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 +BRIAN PAUL 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. diff --git a/ChangeLog b/ChangeLog index 5dea73e..3b0d1bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +0.5 + * Make headers C++ compatible by change *this to *obj + * Add ifdef C++ extern "C" to headers + * Use simpler definition of min and max in bits.h + Larry Lansing, llansing at fuzzynerd dot com + + * Remove automake 1.6 requirement + * Move autogen commands into autogen.sh. Update README + * Remove error pointer special case for Windows + * Change license from LGPL to MIT + Michael Clark + 0.4 * Fix additional error case in object parsing * Add back sign reversal in nested object parse as error pointer diff --git a/Makefile.am b/Makefile.am index 9e86ccd..4b01dc1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,5 @@ -AUTOMAKE_OPTIONS = 1.6 - CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -libjson_la_LIBADD = $(JSON_LIBS) - lib_LTLIBRARIES = libjson.la pkgconfigdir = $(libdir)/pkgconfig diff --git a/README b/README index 9f9fe0b..beeba53 100644 --- a/README +++ b/README @@ -2,11 +2,7 @@ Building on Unix with gcc and autotools If checking out from CVS: - aclocal-1.6 - libtoolize --copy - autoheader - automake-1.6 --add-missing --copy - autoconf + sh autogen.sh Then configure, make, make install diff --git a/README-WIN32.html b/README-WIN32.html index c20fc83..fb50159 100644 --- a/README-WIN32.html +++ b/README-WIN32.html @@ -51,13 +51,11 @@ Logging in to :pserver:anoncvs@cvs.metaparadigm.com:2401/cvsroot
CVS password: <enter 'anoncvs'>
# cvs co json-c

-

Copyright Metaparadigm Pte. Ltd. 2004. Michael +

Copyright Metaparadigm Pte. Ltd. 2004, 2005. Michael Clark

This program is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public (LGPL) License as published by the - Free Software Foundation; either version 2.1 of the License, or (at your - option) any later version.

+ the terms of the MIT License. See COPYING for details.

diff --git a/README.html b/README.html index 65d9917..c55600a 100644 --- a/README.html +++ b/README.html @@ -8,7 +8,7 @@

JSON-C - A JSON implementation in C

-

Latest release: json-c-0.4.tar.gz

+

Latest release: json-c-0.5.tar.gz

JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.

@@ -26,13 +26,11 @@ Logging in to :pserver:anoncvs@cvs.metaparadigm.com:2401/cvsroot
CVS password: <enter 'anoncvs'>
# cvs co json-c

-

Copyright Metaparadigm Pte. Ltd. 2004. Michael +

Copyright Metaparadigm Pte. Ltd. 2004, 2005. Michael Clark

This program is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public (LGPL) License as published by the - Free Software Foundation; either version 2.1 of the License, or (at your - option) any later version.

+ the terms of the MIT License. See COPYING for details.

diff --git a/arraylist.c b/arraylist.c index be93e26..dbd075d 100644 --- a/arraylist.c +++ b/arraylist.c @@ -1,18 +1,11 @@ /* - * $Id: arraylist.c,v 1.3 2005/06/14 22:41:51 mclark Exp $ + * $Id: arraylist.c,v 1.4 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/arraylist.h b/arraylist.h index d82f14a..2948e04 100644 --- a/arraylist.h +++ b/arraylist.h @@ -1,18 +1,11 @@ /* - * $Id: arraylist.h,v 1.2 2004/07/21 01:24:33 mclark Exp $ + * $Id: arraylist.h,v 1.4 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ @@ -35,18 +28,18 @@ extern struct array_list* array_list_new(array_list_free_fn *free_fn); extern void -array_list_free(struct array_list *this); +array_list_free(struct array_list *al); extern void* -array_list_get_idx(struct array_list *this, int i); +array_list_get_idx(struct array_list *al, int i); extern int -array_list_put_idx(struct array_list *this, int i, void *data); +array_list_put_idx(struct array_list *al, int i, void *data); extern int -array_list_add(struct array_list *this, void *data); +array_list_add(struct array_list *al, void *data); extern int -array_list_length(struct array_list *this); +array_list_length(struct array_list *al); #endif diff --git a/autogen.sh b/autogen.sh new file mode 100644 index 0000000..c67b903 --- /dev/null +++ b/autogen.sh @@ -0,0 +1 @@ +autoreconf -v --install || exit 1 diff --git a/bits.h b/bits.h index 49e5967..379793a 100644 --- a/bits.h +++ b/bits.h @@ -1,18 +1,11 @@ /* - * $Id: bits.h,v 1.7 2005/07/15 02:40:44 mclark Exp $ + * $Id: bits.h,v 1.9 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ @@ -31,27 +24,15 @@ */ #ifndef min -#define min(x,y) ({ \ - typeof(x) _x = (x); \ - typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x < _y ? _x : _y; }) +#define min(a,b) ((a) < (b) ? (a) : (b)) #endif #ifndef max -#define max(x,y) ({ \ - typeof(x) _x = (x); \ - typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x > _y ? _x : _y; }) +#define max(a,b) ((a) > (b) ? (a) : (b)) #endif #define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9) #define error_ptr(error) ((void*)error) -#ifdef _MSC_VER -#define is_error(ptr) ((UINT_PTR)ptr > (UINT_PTR)-4000L) -#else #define is_error(ptr) ((unsigned long)ptr > (unsigned long)-4000L) -#endif #endif diff --git a/config.h.win32 b/config.h.win32 index 878d6c3..7f7e6ae 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,18 +1,11 @@ /* - * $Id: config.h.win32,v 1.1 2005/06/14 22:41:51 mclark Exp $ + * $Id: config.h.win32,v 1.2 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/debug.c b/debug.c index a4d12f1..eaa6fca 100644 --- a/debug.c +++ b/debug.c @@ -1,18 +1,11 @@ /* - * $Id: debug.c,v 1.4 2005/06/14 22:41:51 mclark Exp $ + * $Id: debug.c,v 1.5 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/debug.h b/debug.h index 581b76d..f825a44 100644 --- a/debug.h +++ b/debug.h @@ -1,18 +1,11 @@ /* - * $Id: debug.h,v 1.3 2005/06/14 22:41:51 mclark Exp $ + * $Id: debug.h,v 1.4 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/json.h b/json.h index 14bff2b..a5a3432 100644 --- a/json.h +++ b/json.h @@ -1,24 +1,21 @@ /* - * $Id: json.h,v 1.4 2004/08/07 03:13:52 mclark Exp $ + * $Id: json.h,v 1.6 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ #ifndef _json_h_ #define _json_h_ +#ifdef __cplusplus +extern "C" { +#endif + #include "bits.h" #include "debug.h" #include "linkhash.h" @@ -27,4 +24,8 @@ #include "json_object.h" #include "json_tokener.h" +#ifdef __cplusplus +} +#endif + #endif diff --git a/json_object.c b/json_object.c index b88aa4d..fecd72b 100644 --- a/json_object.c +++ b/json_object.c @@ -1,18 +1,11 @@ /* - * $Id: json_object.c,v 1.13 2005/06/14 22:41:51 mclark Exp $ + * $Id: json_object.c,v 1.14 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/json_object.h b/json_object.h index 0f32ead..4232447 100644 --- a/json_object.h +++ b/json_object.h @@ -1,18 +1,11 @@ /* - * $Id: json_object.h,v 1.9 2005/06/14 22:41:51 mclark Exp $ + * $Id: json_object.h,v 1.11 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ @@ -50,27 +43,27 @@ enum json_type { json_type_int, json_type_object, json_type_array, - json_type_string, + json_type_string }; /* reference counting functions */ /** * Increment the reference count of json_object - * @param this the json_object instance + * @param obj the json_object instance */ -extern struct json_object* json_object_get(struct json_object *this); +extern struct json_object* json_object_get(struct json_object *obj); /** * Decrement the reference count of json_object and free if it reaches zero - * @param this the json_object instance + * @param obj the json_object instance */ -extern void json_object_put(struct json_object *this); +extern void json_object_put(struct json_object *obj); /** * Check if the json_object is of a given type - * @param this the json_object instance + * @param obj the json_object instance * @param type one of: json_type_boolean, json_type_double, @@ -79,11 +72,11 @@ extern void json_object_put(struct json_object *this); json_type_array, json_type_string, */ -extern int json_object_is_type(struct json_object *this, enum json_type type); +extern int json_object_is_type(struct json_object *obj, enum json_type type); /** * Get the type of the json_object - * @param this the json_object instance + * @param obj the json_object instance * @returns type being one of: json_type_boolean, json_type_double, @@ -92,14 +85,14 @@ extern int json_object_is_type(struct json_object *this, enum json_type type); json_type_array, json_type_string, */ -extern enum json_type json_object_get_type(struct json_object *this); +extern enum json_type json_object_get_type(struct json_object *obj); /** Stringify object to json format - * @param this the json_object instance + * @param obj the json_object instance * @returns a string in JSON format */ -extern char* json_object_to_json_string(struct json_object *this); +extern char* json_object_to_json_string(struct json_object *obj); /* object type methods */ @@ -110,10 +103,10 @@ extern char* json_object_to_json_string(struct json_object *this); extern struct json_object* json_object_new_object(); /** Get the hashtable of a json_object of type json_type_object - * @param this the json_object instance + * @param obj the json_object instance * @returns a linkhash */ -extern struct lh_table* json_object_get_object(struct json_object *this); +extern struct lh_table* json_object_get_object(struct json_object *obj); /** Add an object field to a json_object of type json_type_object * @@ -121,29 +114,29 @@ extern struct lh_table* json_object_get_object(struct json_object *this); * fields to objects in code more compact. If you want to retain a reference * to an added object you must wrap the passed object with json_object_get * - * @param this the json_object instance + * @param obj the json_object instance * @param key the object field name (a private copy will be duplicated) * @param val a json_object or NULL member to associate with the given field */ -extern void json_object_object_add(struct json_object* this, char *key, +extern void json_object_object_add(struct json_object* obj, char *key, struct json_object *val); /** Get the json_object associate with a given object field - * @param this the json_object instance + * @param obj the json_object instance * @param key the object field name * @returns the json_object associated with the given field name */ -extern struct json_object* json_object_object_get(struct json_object* this, +extern struct json_object* json_object_object_get(struct json_object* obj, char *key); /** Delete the given json_object field * * The reference count will be decremented for the deleted object * - * @param this the json_object instance + * @param obj the json_object instance * @param key the object field name */ -extern void json_object_object_del(struct json_object* this, char *key); +extern void json_object_object_del(struct json_object* obj, char *key); /** Iterate through all keys and values of an object * @param obj the json_object instance @@ -179,16 +172,16 @@ extern void json_object_object_del(struct json_object* this, char *key); extern struct json_object* json_object_new_array(); /** Get the arraylist of a json_object of type json_type_array - * @param this the json_object instance + * @param obj the json_object instance * @returns an arraylist */ -extern struct array_list* json_object_get_array(struct json_object *this); +extern struct array_list* json_object_get_array(struct json_object *obj); /** Get the length of a json_object of type json_type_array - * @param this the json_object instance + * @param obj the json_object instance * @returns an int */ -extern int json_object_array_length(struct json_object *this); +extern int json_object_array_length(struct json_object *obj); /** Add an element to the end of a json_object of type json_type_array * @@ -196,10 +189,10 @@ extern int json_object_array_length(struct json_object *this); * fields to objects in code more compact. If you want to retain a reference * to an added object you must wrap the passed object with json_object_get * - * @param this the json_object instance + * @param obj the json_object instance * @param val the json_object to be added */ -extern int json_object_array_add(struct json_object *this, +extern int json_object_array_add(struct json_object *obj, struct json_object *val); /** Insert or replace an element at a specified index in an array (a json_object of type json_type_array) @@ -213,19 +206,19 @@ extern int json_object_array_add(struct json_object *this, * The array size will be automatically be expanded to the size of the * index if the index is larger than the current size. * - * @param this the json_object instance + * @param obj the json_object instance * @param idx the index to insert the element at * @param val the json_object to be added */ -extern int json_object_array_put_idx(struct json_object *this, int idx, +extern int json_object_array_put_idx(struct json_object *obj, int idx, struct json_object *val); /** Get the element at specificed index of the array (a json_object of type json_type_array) - * @param this the json_object instance + * @param obj the json_object instance * @param idx the index to get the element at * @returns the json_object at the specified index (or NULL) */ -extern struct json_object* json_object_array_get_idx(struct json_object *this, +extern struct json_object* json_object_array_get_idx(struct json_object *obj, int idx); /* boolean type methods */ @@ -244,10 +237,10 @@ extern struct json_object* json_object_new_boolean(boolean b); * TRUE if it has a non zero length. If any other object type is passed * TRUE will be returned if the object is not NULL. * - * @param this the json_object instance + * @param obj the json_object instance * @returns a boolean */ -extern boolean json_object_get_boolean(struct json_object *this); +extern boolean json_object_get_boolean(struct json_object *obj); /* int type methods */ @@ -264,10 +257,10 @@ extern struct json_object* json_object_new_int(int i); * double objects will return their integer conversion. Strings will be * parsed as an integer. If no conversion exists then 0 is returned. * - * @param this the json_object instance + * @param obj the json_object instance * @returns an int */ -extern int json_object_get_int(struct json_object *this); +extern int json_object_get_int(struct json_object *obj); /* double type methods */ @@ -284,10 +277,10 @@ extern struct json_object* json_object_new_double(double d); * integer objects will return their dboule conversion. Strings will be * parsed as a double. If no conversion exists then 0.0 is returned. * - * @param this the json_object instance + * @param obj the json_object instance * @returns an double */ -extern double json_object_get_double(struct json_object *this); +extern double json_object_get_double(struct json_object *obj); /* string type methods */ @@ -311,9 +304,9 @@ extern struct json_object* json_object_new_string_len(char *s, int len); * The returned string memory is managed by the json_object and will * be freed when the reference count of the json_object drops to zero. * - * @param this the json_object instance + * @param obj the json_object instance * @returns a string */ -extern char* json_object_get_string(struct json_object *this); +extern char* json_object_get_string(struct json_object *obj); #endif diff --git a/json_object_private.h b/json_object_private.h index 4548144..35a44f3 100644 --- a/json_object_private.h +++ b/json_object_private.h @@ -1,18 +1,11 @@ /* - * $Id: json_object_private.h,v 1.3 2005/06/14 22:41:51 mclark Exp $ + * $Id: json_object_private.h,v 1.4 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/json_tokener.c b/json_tokener.c index fdb5113..6a1ea89 100644 --- a/json_tokener.c +++ b/json_tokener.c @@ -1,18 +1,11 @@ /* - * $Id: json_tokener.c,v 1.17 2005/07/26 07:49:11 mclark Exp $ + * $Id: json_tokener.c,v 1.18 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/json_tokener.h b/json_tokener.h index 9bdf238..f36c058 100644 --- a/json_tokener.h +++ b/json_tokener.h @@ -1,18 +1,11 @@ /* - * $Id: json_tokener.h,v 1.6 2005/06/14 22:41:51 mclark Exp $ + * $Id: json_tokener.h,v 1.8 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ @@ -32,7 +25,7 @@ enum json_tokener_error { json_tokener_error_parse_object, json_tokener_error_parse_string, json_tokener_error_parse_comment, - json_tokener_error_parse_eof, + json_tokener_error_parse_eof }; enum json_tokener_state { @@ -56,7 +49,7 @@ enum json_tokener_state { json_tokener_state_object_field, json_tokener_state_object_field_end, json_tokener_state_object_value, - json_tokener_state_object_sep, + json_tokener_state_object_sep }; struct json_tokener diff --git a/json_util.c b/json_util.c index 07abd89..0aaf0f7 100644 --- a/json_util.c +++ b/json_util.c @@ -1,18 +1,11 @@ /* - * $Id: json_util.c,v 1.2 2005/06/14 22:41:51 mclark Exp $ + * $Id: json_util.c,v 1.3 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/json_util.h b/json_util.h index 3915419..cbaab5d 100644 --- a/json_util.h +++ b/json_util.h @@ -1,18 +1,11 @@ /* - * $Id: json_util.h,v 1.2 2005/06/14 22:41:51 mclark Exp $ + * $Id: json_util.h,v 1.3 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/linkhash.c b/linkhash.c index 81abc48..6cfc9a0 100644 --- a/linkhash.c +++ b/linkhash.c @@ -1,18 +1,11 @@ /* - * $Id: linkhash.c,v 1.3 2005/06/14 22:41:51 mclark Exp $ + * $Id: linkhash.c,v 1.4 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/linkhash.h b/linkhash.h index d6be31d..86110b8 100644 --- a/linkhash.h +++ b/linkhash.h @@ -1,18 +1,11 @@ /* - * $Id: linkhash.h,v 1.4 2005/06/14 22:41:51 mclark Exp $ + * $Id: linkhash.h,v 1.5 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/printbuf.c b/printbuf.c index 7e70fb0..79bdaf5 100644 --- a/printbuf.c +++ b/printbuf.c @@ -1,18 +1,11 @@ /* - * $Id: printbuf.c,v 1.4 2005/06/14 22:41:51 mclark Exp $ + * $Id: printbuf.c,v 1.5 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/printbuf.h b/printbuf.h index 6f43a0e..bc1669b 100644 --- a/printbuf.h +++ b/printbuf.h @@ -1,18 +1,11 @@ /* - * $Id: printbuf.h,v 1.3 2005/06/14 22:41:51 mclark Exp $ + * $Id: printbuf.h,v 1.4 2006/01/26 02:16:28 mclark Exp $ * - * Copyright Metaparadigm Pte. Ltd. 2004. + * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd. * Michael Clark * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public (LGPL) - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details: http://www.gnu.org/ + * This library is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See COPYING for details. * */ diff --git a/test1.c b/test1.c index 7f34cdc..8e49d10 100644 --- a/test1.c +++ b/test1.c @@ -8,6 +8,7 @@ int main(int argc, char **argv) { struct json_object *my_string, *my_int, *my_object, *my_array; struct json_object *new_obj; + int i; my_string = json_object_new_string("\t"); printf("my_string=%s\n", json_object_get_string(my_string)); @@ -28,7 +29,7 @@ int main(int argc, char **argv) json_object_array_add(my_array, json_object_new_int(3)); json_object_array_put_idx(my_array, 4, json_object_new_int(5)); printf("my_array=\n"); - for(int i=0; i < json_object_array_length(my_array); i++) { + for(i=0; i < json_object_array_length(my_array); i++) { struct json_object *obj = json_object_array_get_idx(my_array, i); printf("\t[%d]=%s\n", i, json_object_to_json_string(obj)); }