From e42371fab16185452de747d7b772da1df7eec686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Schr=C3=B6der?= Date: Tue, 4 Oct 2016 20:47:28 +0200 Subject: [PATCH] cleanup - use endian.h instead of custom rolled endian functions - remove utils and remove everything including container_of --- COPYING | 675 ++++++++++++++++++++++++++++++++++++- src/Makefile.am | 4 +- src/Makefile.in | 18 +- src/blob.c | 48 +-- src/blob.h | 36 +- src/blob_field.c | 43 ++- src/blob_field.h | 20 +- src/blob_json.c | 41 +-- src/blob_json.h | 35 +- src/blobpack.h | 18 + src/{utils.c => ieee754.c} | 87 +---- src/ieee754.h | 32 ++ src/utils.h | 205 ----------- 13 files changed, 866 insertions(+), 396 deletions(-) mode change 120000 => 100644 COPYING rename src/{utils.c => ieee754.c} (56%) create mode 100644 src/ieee754.h delete mode 100644 src/utils.h diff --git a/COPYING b/COPYING deleted file mode 120000 index caeca07..0000000 --- a/COPYING +++ /dev/null @@ -1 +0,0 @@ -/usr/share/automake-1.14/COPYING \ No newline at end of file diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state 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 program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/src/Makefile.am b/src/Makefile.am index fd9a2de..f47aed1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ @CODE_COVERAGE_RULES@ includedir=$(prefix)/include/blobpack/ lib_LTLIBRARIES=libblobpack.la -include_HEADERS=blobpack.h blob.h blob_field.h blob_json.h utils.h -libblobpack_la_SOURCES=blob.c blob_field.c blob_json.c blob_ujson.c ujsondec.c ujsonenc.c utils.c +include_HEADERS=blobpack.h blob.h blob_field.h blob_json.h +libblobpack_la_SOURCES=blob.c blob_field.c blob_json.c blob_ujson.c ujsondec.c ujsonenc.c ieee754.c libblobpack_la_CFLAGS=$(CODE_COVERAGE_CFLAGS) -std=gnu99 -Wall -Werror -Wno-format-y2k -W -Wstrict-prototypes -Wmissing-prototypes \ -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \ -Wshadow -Wcast-align -Wchar-subscripts -Winline \ diff --git a/src/Makefile.in b/src/Makefile.in index 0534dc2..1369b7c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -125,7 +125,7 @@ libblobpack_la_LIBADD = am_libblobpack_la_OBJECTS = libblobpack_la-blob.lo \ libblobpack_la-blob_field.lo libblobpack_la-blob_json.lo \ libblobpack_la-blob_ujson.lo libblobpack_la-ujsondec.lo \ - libblobpack_la-ujsonenc.lo libblobpack_la-utils.lo + libblobpack_la-ujsonenc.lo libblobpack_la-ieee754.lo libblobpack_la_OBJECTS = $(am_libblobpack_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -321,8 +321,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libblobpack.la -include_HEADERS = blobpack.h blob.h blob_field.h blob_json.h utils.h -libblobpack_la_SOURCES = blob.c blob_field.c blob_json.c blob_ujson.c ujsondec.c ujsonenc.c utils.c +include_HEADERS = blobpack.h blob.h blob_field.h blob_json.h +libblobpack_la_SOURCES = blob.c blob_field.c blob_json.c blob_ujson.c ujsondec.c ujsonenc.c ieee754.c libblobpack_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) -std=gnu99 -Wall -Werror -Wno-format-y2k -W -Wstrict-prototypes -Wmissing-prototypes \ -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \ -Wshadow -Wcast-align -Wchar-subscripts -Winline \ @@ -413,9 +413,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-blob_field.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-blob_json.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-blob_ujson.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-ieee754.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-ujsondec.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-ujsonenc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libblobpack_la-utils.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -480,12 +480,12 @@ libblobpack_la-ujsonenc.lo: ujsonenc.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libblobpack_la_CFLAGS) $(CFLAGS) -c -o libblobpack_la-ujsonenc.lo `test -f 'ujsonenc.c' || echo '$(srcdir)/'`ujsonenc.c -libblobpack_la-utils.lo: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libblobpack_la_CFLAGS) $(CFLAGS) -MT libblobpack_la-utils.lo -MD -MP -MF $(DEPDIR)/libblobpack_la-utils.Tpo -c -o libblobpack_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libblobpack_la-utils.Tpo $(DEPDIR)/libblobpack_la-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='libblobpack_la-utils.lo' libtool=yes @AMDEPBACKSLASH@ +libblobpack_la-ieee754.lo: ieee754.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libblobpack_la_CFLAGS) $(CFLAGS) -MT libblobpack_la-ieee754.lo -MD -MP -MF $(DEPDIR)/libblobpack_la-ieee754.Tpo -c -o libblobpack_la-ieee754.lo `test -f 'ieee754.c' || echo '$(srcdir)/'`ieee754.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libblobpack_la-ieee754.Tpo $(DEPDIR)/libblobpack_la-ieee754.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ieee754.c' object='libblobpack_la-ieee754.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libblobpack_la_CFLAGS) $(CFLAGS) -c -o libblobpack_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libblobpack_la_CFLAGS) $(CFLAGS) -c -o libblobpack_la-ieee754.lo `test -f 'ieee754.c' || echo '$(srcdir)/'`ieee754.c mostlyclean-libtool: -rm -f *.lo diff --git a/src/blob.c b/src/blob.c index 39a9477..6f96b9b 100644 --- a/src/blob.c +++ b/src/blob.c @@ -1,23 +1,23 @@ /* - * blob - library for generating/parsing tagged binary data - * - * Copyright (C) 2010 Felix Fietkau - * Copyright (C) 2015 Martin Schröder - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ + Copyright (C) 2010 Felix Fietkau + Copyright (C) 2015 Martin Schröder + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ #include "blob.h" +#include "ieee754.h" #define pack754_32(f) (pack754((f), 32, 8)) #define pack754_64(f) (pack754((f), 64, 11)) @@ -39,7 +39,7 @@ static void blob_field_init(struct blob_field *attr, uint32_t id, uint32_t len){ //len += sizeof(struct blob_field); len &= BLOB_FIELD_LEN_MASK; len |= (id << BLOB_FIELD_ID_SHIFT) & BLOB_FIELD_ID_MASK; - attr->id_len = cpu_to_be32(len); + attr->id_len = htobe32(len); } //! Attepts to reallocate the buffer to fit the new payload data @@ -129,7 +129,7 @@ static struct blob_field *blob_new_attr(struct blob *buf, int id, int payload){ /*if(name){ attr->id_len |= be32_to_cpu(BLOB_FIELD_HAS_NAME); struct blob_name_hdr *hdr = (struct blob_name_hdr*)attr->data; - hdr->namelen = cpu_to_be16(namelen); + hdr->namelen = htobe16(namelen); strncpy((char *) hdr->name, (const char *)name, namelen); }*/ @@ -175,17 +175,17 @@ static struct blob_field *blob_put_u8(struct blob *buf, uint8_t val){ } static struct blob_field *blob_put_u16(struct blob *buf, uint16_t val){ - val = cpu_to_be16(val); + val = htobe16(val); return blob_put(buf, BLOB_FIELD_INT16, &val, sizeof(val)); } static struct blob_field *blob_put_u32(struct blob *buf, uint32_t val){ - val = cpu_to_be32(val); + val = htobe32(val); return blob_put(buf, BLOB_FIELD_INT32, &val, sizeof(val)); } static struct blob_field *blob_put_u64(struct blob *buf, uint64_t val){ - val = cpu_to_be64(val); + val = htobe64(val); return blob_put(buf, BLOB_FIELD_INT64, &val, sizeof(val)); } @@ -226,12 +226,12 @@ void blob_close_table(struct blob *buf, blob_offset_t offset){ } static struct blob_field *blob_put_float(struct blob *buf, double value){ - uint32_t val = cpu_to_be32(pack754_32((float)value)); + uint32_t val = htobe32(pack754_32((float)value)); return blob_put(buf, BLOB_FIELD_FLOAT32, &val, sizeof(val)); } static struct blob_field *blob_put_double(struct blob *buf, double value){ - uint64_t val = cpu_to_be64(pack754_64(value)); + uint64_t val = htobe64(pack754_64(value)); return blob_put(buf, BLOB_FIELD_FLOAT64, &val, sizeof(val)); } diff --git a/src/blob.h b/src/blob.h index d66b74e..7268a31 100644 --- a/src/blob.h +++ b/src/blob.h @@ -1,23 +1,21 @@ /* - * blob - library for generating/parsing tagged binary data - * - * Copyright (C) 2010 Felix Fietkau - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ + Copyright (C) 2010 Felix Fietkau + Copyright (C) 2015 Martin Schröder -#ifndef _BLOB_H__ -#define _BLOB_H__ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ +#pragma once #include #include @@ -28,7 +26,6 @@ #include #include "blob_field.h" -#include "utils.h" // arbitrary max size just to make sure we don't try to resize to a crazy value (should be something large yet reasonable!) #define BLOB_MAX_SIZE (10000000) @@ -144,4 +141,3 @@ struct blob_field *blob_put_attr(struct blob *buf, const struct blob_field *attr //! print out the whole buffer void blob_dump(struct blob *self); -#endif diff --git a/src/blob_field.c b/src/blob_field.c index c3e07c4..1076960 100644 --- a/src/blob_field.c +++ b/src/blob_field.c @@ -1,7 +1,24 @@ +/* + Copyright (C) 2010 Felix Fietkau + Copyright (C) 2015 Martin Schröder + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "blob.h" #include "blob_field.h" - static const int blob_type_minlen[BLOB_FIELD_LAST] = { [BLOB_FIELD_STRING] = 1, [BLOB_FIELD_INT8] = sizeof(uint8_t), @@ -29,8 +46,8 @@ void blob_field_set_raw_len(struct blob_field *attr, uint32_t len){ if(!attr) return; if(len < sizeof(struct blob_field)) len = sizeof(struct blob_field); len &= BLOB_FIELD_LEN_MASK; - attr->id_len &= ~cpu_to_be32(BLOB_FIELD_LEN_MASK); - attr->id_len |= cpu_to_be32(len); + attr->id_len &= ~htobe32(BLOB_FIELD_LEN_MASK); + attr->id_len |= htobe32(len); } /* bool blob_field_check_type(const void *ptr, unsigned int len, int type){ @@ -105,34 +122,34 @@ void blob_field_set_u8(const struct blob_field *attr, uint8_t val){ static uint16_t blob_field_get_u16(const struct blob_field *attr){ assert(attr); const uint16_t *tmp = (const uint16_t*)(const void*)attr->data; - return be16_to_cpu(*tmp); + return be16toh(*tmp); } /* void blob_field_set_u16(const struct blob_field *attr, uint16_t val){ if(!attr) return; uint16_t *tmp = (uint16_t*)attr->data; - *tmp = cpu_to_be16(val); + *tmp = htobe16(val); } */ static uint32_t blob_field_get_u32(const struct blob_field *attr){ assert(attr); const uint32_t *tmp = (const uint32_t*)(const void*)attr->data; - return be32_to_cpu(*tmp); + return be32toh(*tmp); } /* void blob_field_set_u32(const struct blob_field *attr, uint32_t val){ if(!attr) return; uint32_t *tmp = (uint32_t*)attr->data; - *tmp = cpu_to_be32(val); + *tmp = htobe32(val); } */ static uint64_t blob_field_get_u64(const struct blob_field *attr){ assert(attr); const uint32_t *ptr = (const uint32_t *) blob_field_data(attr); - uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32; - tmp |= be32_to_cpu(ptr[1]); + uint64_t tmp = ((uint64_t) be32toh(ptr[0])) << 32; + tmp |= be32toh(ptr[1]); return tmp; } @@ -247,22 +264,22 @@ size_t blob_field_get_raw(const struct blob_field *attr, uint8_t *data, size_t d //! returns the type of the attribute uint8_t blob_field_type(const struct blob_field *attr){ if(!attr) return BLOB_FIELD_INVALID; - int id = (be32_to_cpu(attr->id_len) & BLOB_FIELD_ID_MASK) >> BLOB_FIELD_ID_SHIFT; + int id = (be32toh(attr->id_len) & BLOB_FIELD_ID_MASK) >> BLOB_FIELD_ID_SHIFT; return id; } /* void blob_field_set_type(struct blob_field *self, int type){ assert(self); - int id_len = be32_to_cpu(self->id_len); + int id_len = be32toh(self->id_len); id_len = (id_len & ~BLOB_FIELD_ID_MASK) | (type << BLOB_FIELD_ID_SHIFT); - self->id_len = cpu_to_be32(id_len); + self->id_len = htobe32(id_len); } */ //! returns full length of attribute unsigned int blob_field_raw_len(const struct blob_field *attr){ assert(attr); - return (be32_to_cpu(attr->id_len) & BLOB_FIELD_LEN_MASK); + return (be32toh(attr->id_len) & BLOB_FIELD_LEN_MASK); } //! includes length of data of the attribute diff --git a/src/blob_field.h b/src/blob_field.h index 351b09b..e90654e 100644 --- a/src/blob_field.h +++ b/src/blob_field.h @@ -1,7 +1,25 @@ +/* + copyright (c) 2010 felix fietkau + copyright (c) 2015 martin schröder + + this program is free software: you can redistribute it and/or modify + it under the terms of the gnu general public license as published by + the free software foundation, either version 3 of the license, or + (at your option) any later version. + + this program 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 general public license for more details. + + you should have received a copy of the gnu general public license + along with this program. if not, see . +*/ + #pragma once #include -#include "utils.h" +#include "ieee754.h" #define BLOB_FIELD_ID_MASK 0x7f000000 #define BLOB_FIELD_ID_SHIFT 24 diff --git a/src/blob_json.c b/src/blob_json.c index 01c725e..447d1cb 100644 --- a/src/blob_json.c +++ b/src/blob_json.c @@ -1,18 +1,21 @@ /* - * Copyright (C) 2010-2012 Felix Fietkau - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ + Copyright (C) 2010 Felix Fietkau + Copyright (C) 2015 Martin Schröder + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include #include "blob.h" #include "blob_json.h" @@ -236,19 +239,19 @@ static void blob_format_element(struct strbuf *s, const struct blob_field *attr, sprintf(buf, "%d", *(const uint8_t*)data); break; case BLOB_FIELD_INT16: - sprintf(buf, "%d", be16_to_cpu(*(const uint16_t *)data)); + sprintf(buf, "%d", be16toh(*(const uint16_t *)data)); break; case BLOB_FIELD_INT32: - sprintf(buf, "%d", (int) be32_to_cpu(*(const uint32_t *)data)); + sprintf(buf, "%d", (int) be32toh(*(const uint32_t *)data)); break; case BLOB_FIELD_INT64: - sprintf(buf, "%lld", (long long int) be64_to_cpu(*(const uint64_t *)data)); + sprintf(buf, "%lld", (long long int) be64toh(*(const uint64_t *)data)); break; case BLOB_FIELD_FLOAT32: - sprintf(buf, "%f", (double) unpack754_32(be32_to_cpu(*(const uint32_t*)data))); + sprintf(buf, "%f", (double) unpack754_32(be32toh(*(const uint32_t*)data))); break; case BLOB_FIELD_FLOAT64: - sprintf(buf, "%Le", unpack754_64(be64_to_cpu(*(const uint64_t*)data))); + sprintf(buf, "%Le", unpack754_64(be64toh(*(const uint64_t*)data))); break; case BLOB_FIELD_STRING: blob_format_string(s, blob_field_data(attr)); diff --git a/src/blob_json.h b/src/blob_json.h index 21bf96c..d8f4a05 100644 --- a/src/blob_json.h +++ b/src/blob_json.h @@ -1,20 +1,22 @@ /* - * Copyright (C) 2010-2012 Felix Fietkau - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#ifndef __BLOBMSG_JSON_H -#define __BLOBMSG_JSON_H + Copyright (C) 2010 Felix Fietkau + Copyright (C) 2015 Martin Schröder + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#pragma once struct json_object; @@ -42,4 +44,3 @@ bool blob_init_from_json(struct blob *self, const char *json); bool blob_put_json(struct blob *self, const char *json); bool blob_put_json_from_file(struct blob *self, const char *file); -#endif diff --git a/src/blobpack.h b/src/blobpack.h index fad8fab..b92442c 100644 --- a/src/blobpack.h +++ b/src/blobpack.h @@ -1,3 +1,21 @@ +/* + copyright (c) 2010 felix fietkau + copyright (c) 2015 martin schröder + + this program is free software: you can redistribute it and/or modify + it under the terms of the gnu general public license as published by + the free software foundation, either version 3 of the license, or + (at your option) any later version. + + this program 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 general public license for more details. + + you should have received a copy of the gnu general public license + along with this program. if not, see . +*/ + #pragma once #include "blob.h" diff --git a/src/utils.c b/src/ieee754.c similarity index 56% rename from src/utils.c rename to src/ieee754.c index 1231134..702fe63 100644 --- a/src/utils.c +++ b/src/ieee754.c @@ -1,7 +1,5 @@ /* - * utils - misc libubox utility functions - * - * Copyright (C) 2012 Felix Fietkau + * Copyright (C) 2016 Martin Schröder * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,16 +14,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "utils.h" +#include "ieee754.h" #include #include #include -#define foreach_arg(_arg, _addr, _len, _first_addr, _first_len) \ - for (_addr = (_first_addr), _len = (_first_len); \ - _addr; \ - _addr = va_arg(_arg, void **), _len = _addr ? va_arg(_arg, size_t) : 0) - uint64_t pack754(long double f, unsigned bits, unsigned expbits){ long double fnorm; int shift; @@ -78,80 +71,4 @@ long double unpack754(uint64_t i, unsigned bits, unsigned expbits){ return result; } -/* -void *__calloc_a(size_t len, ...) -{ - va_list ap, ap1; - void *ret; - void **cur_addr; - size_t cur_len; - int alloc_len = 0; - char *ptr; - va_start(ap, len); - - va_copy(ap1, ap); - foreach_arg(ap1, cur_addr, cur_len, &ret, len) - alloc_len += cur_len; - va_end(ap1); - - ptr = calloc(1, alloc_len); - alloc_len = 0; - foreach_arg(ap, cur_addr, cur_len, &ret, len) { - *cur_addr = &ptr[alloc_len]; - alloc_len += cur_len; - } - va_end(ap); - - return ret; -} -*/ -#if 0 -#ifdef __APPLE__ -#include /* host_get_clock_service() */ -#include /* mach_port_deallocate() */ -#include /* mach_host_self(), mach_task_self() */ -#include /* clock_get_time() */ - -static clock_serv_t clock_realtime; -static clock_serv_t clock_monotonic; - -static void __constructor clock_name_init(void) -{ - mach_port_t host_self = mach_host_self(); - - host_get_clock_service(host_self, CLOCK_REALTIME, &clock_realtime); - host_get_clock_service(host_self, CLOCK_MONOTONIC, &clock_monotonic); -} - -static void __destructor clock_name_dealloc(void) -{ - mach_port_t self = mach_task_self(); - - mach_port_deallocate(self, clock_realtime); - mach_port_deallocate(self, clock_monotonic); -} - -int clock_gettime(int type, struct timespec *tv) -{ - int retval = -1; - mach_timespec_t mts; - - switch (type) { - case CLOCK_REALTIME: - retval = clock_get_time(clock_realtime, &mts); - break; - case CLOCK_MONOTONIC: - retval = clock_get_time(clock_monotonic, &mts); - break; - default: - goto out; - } - - tv->tv_sec = mts.tv_sec; - tv->tv_nsec = mts.tv_nsec; -out: - return retval; -} -#endif -#endif diff --git a/src/ieee754.h b/src/ieee754.h new file mode 100644 index 0000000..910c1ce --- /dev/null +++ b/src/ieee754.h @@ -0,0 +1,32 @@ +/* + copyright (c) 2010 felix fietkau + copyright (c) 2015 martin schröder + + this program is free software: you can redistribute it and/or modify + it under the terms of the gnu general public license as published by + the free software foundation, either version 3 of the license, or + (at your option) any later version. + + this program 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 general public license for more details. + + you should have received a copy of the gnu general public license + along with this program. if not, see . +*/ + + +#pragma once + +#include + +#define pack754_32(f) (pack754((f), 32, 8)) +#define pack754_64(f) (pack754((f), 64, 11)) +#define unpack754_32(i) (unpack754((i), 32, 8)) +#define unpack754_64(i) (unpack754((i), 64, 11)) + +uint64_t pack754(long double f, unsigned bits, unsigned expbits); +long double unpack754(uint64_t i, unsigned bits, unsigned expbits); + + diff --git a/src/utils.h b/src/utils.h deleted file mode 100644 index 8e9bdc5..0000000 --- a/src/utils.h +++ /dev/null @@ -1,205 +0,0 @@ -/* - * utils - misc libubox utility functions - * - * Copyright (C) 2012 Felix Fietkau - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef __LIBUBOX_UTILS_H -#define __LIBUBOX_UTILS_H - -#include -#include -#include - -/* - * calloc_a(size_t len, [void **addr, size_t len,...], NULL) - * - * allocate a block of memory big enough to hold multiple aligned objects. - * the pointer to the full object (starting with the first chunk) is returned, - * all other pointers are stored in the locations behind extra addr arguments. - * the last argument needs to be a NULL pointer - */ - -#define calloc_a(len, ...) __calloc_a(len, ##__VA_ARGS__, NULL) - -void *__calloc_a(size_t len, ...); - -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) -#endif - -#define __BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) - -#ifdef __OPTIMIZE__ -extern int __BUILD_BUG_ON_CONDITION_FAILED; -#define BUILD_BUG_ON(condition) \ - do { \ - __BUILD_BUG_ON(condition); \ - if (condition) \ - __BUILD_BUG_ON_CONDITION_FAILED = 1; \ - } while(0) -#else -#define BUILD_BUG_ON __BUILD_BUG_ON -#endif - -#ifdef __APPLE__ - -#include -#define CLOCK_REALTIME CALENDAR_CLOCK -#define CLOCK_MONOTONIC SYSTEM_CLOCK - -int clock_gettime(int type, struct timespec *tv); - -#endif - -#ifdef __GNUC__ -#define _GNUC_MIN_VER(maj, min) (((__GNUC__ << 8) + __GNUC_MINOR__) >= (((maj) << 8) + (min))) -#else -#define _GNUC_MIN_VER(maj, min) 0 -#endif - -#if defined(__linux__) || defined(__CYGWIN__) -#include -#include - -#elif defined(__APPLE__) -#include -#include -#define bswap_32(x) OSSwapInt32(x) -#define bswap_64(x) OSSwapInt64(x) -#elif defined(__FreeBSD__) -#include -#define bswap_32(x) bswap32(x) -#define bswap_64(x) bswap64(x) -#elif defined(__AVR) -#define __LITTLE_ENDIAN 1234 -#define __BYTE_ORDER __LITTLE_ENDIAN -#else -#include -#define bswap_32(x) swap32(x) -#define bswap_64(x) swap64(x) -#endif - -#ifndef __BYTE_ORDER -#define __BYTE_ORDER BYTE_ORDER -#endif -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN BIG_ENDIAN -#endif -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN LITTLE_ENDIAN -#endif - -static inline uint16_t __u_bswap16(uint16_t val) -{ - return ((val >> 8) & 0xffu) | ((val & 0xffu) << 8); -} - -#if _GNUC_MIN_VER(4, 2) -#define __u_bswap32(x) __builtin_bswap32(x) -#define __u_bswap64(x) __builtin_bswap64(x) -#else -#define __u_bswap32(x) bswap_32(x) -#define __u_bswap64(x) bswap_64(x) -#endif - -#if __BYTE_ORDER == __LITTLE_ENDIAN - -#define cpu_to_be64(x) __u_bswap64(x) -#define cpu_to_be32(x) __u_bswap32(x) -#define cpu_to_be16(x) __u_bswap16((uint16_t) (x)) - -#define be64_to_cpu(x) __u_bswap64(x) -#define be32_to_cpu(x) __u_bswap32(x) -#define be16_to_cpu(x) __u_bswap16((uint16_t) (x)) - -#define cpu_to_le64(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le16(x) (x) - -#define le64_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le16_to_cpu(x) (x) - -#else /* __BYTE_ORDER == __LITTLE_ENDIAN */ - -#define cpu_to_le64(x) __u_bswap64(x) -#define cpu_to_le32(x) __u_bswap32(x) -#define cpu_to_le16(x) __u_bswap16((uint16_t) (x)) - -#define le64_to_cpu(x) __u_bswap64(x) -#define le32_to_cpu(x) __u_bswap32(x) -#define le16_to_cpu(x) __u_bswap16((uint16_t) (x)) - -#define cpu_to_be64(x) (x) -#define cpu_to_be32(x) (x) -#define cpu_to_be16(x) (x) - -#define be64_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define be16_to_cpu(x) (x) - -#endif - -#ifndef __packed -#define __packed __attribute__((packed)) -#endif - -#ifndef __constructor -#define __constructor __attribute__((constructor)) -#endif - -#ifndef __destructor -#define __destructor __attribute__((destructor)) -#endif - -#ifndef __hidden -#define __hidden __attribute__((visibility("hidden"))) -#endif - -#ifndef BITS_PER_LONG -#define BITS_PER_LONG (8 * sizeof(unsigned long)) -#endif - -#define BITFIELD_SIZE(_n) (((_n) + (BITS_PER_LONG - 1)) / BITS_PER_LONG) - -#define pack754_32(f) (pack754((f), 32, 8)) -#define pack754_64(f) (pack754((f), 64, 11)) -#define unpack754_32(i) (unpack754((i), 32, 8)) -#define unpack754_64(i) (unpack754((i), 64, 11)) - - -uint64_t pack754(long double f, unsigned bits, unsigned expbits); -long double unpack754(uint64_t i, unsigned bits, unsigned expbits); - -static inline void bitfield_set(unsigned long *bits, int bit) -{ - bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG)); -} - -static inline bool bitfield_test(unsigned long *bits, int bit) -{ - return !!(bits[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG))); -} - -int b64_encode(const void *src, size_t src_len, - void *dest, size_t dest_len); - -int b64_decode(const void *src, void *dest, size_t dest_len); - -#define B64_ENCODE_LEN(_len) ((((_len) + 2) / 3) * 4 + 1) -#define B64_DECODE_LEN(_len) (((_len) / 4) * 3 + 1) - -#endif