diff options
Diffstat (limited to 'common/dhash')
| -rw-r--r-- | common/dhash/COPYING | 674 | ||||
| -rw-r--r-- | common/dhash/COPYING.LESSER | 165 | ||||
| -rw-r--r-- | common/dhash/Makefile.am | 35 | ||||
| -rw-r--r-- | common/dhash/README | 1 | ||||
| -rw-r--r-- | common/dhash/configure.ac | 31 | ||||
| -rw-r--r-- | common/dhash/dhash.c | 993 | ||||
| -rw-r--r-- | common/dhash/dhash.h | 391 | ||||
| -rw-r--r-- | common/dhash/dhash.pc.in | 11 | ||||
| -rw-r--r-- | common/dhash/examples/dhash_example.c | 138 | ||||
| -rw-r--r-- | common/dhash/examples/dhash_test.c | 510 | ||||
| -rw-r--r-- | common/dhash/m4/.dir | 0 |
11 files changed, 0 insertions, 2949 deletions
diff --git a/common/dhash/COPYING b/common/dhash/COPYING deleted file mode 100644 index 94a9ed024..000000000 --- a/common/dhash/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - 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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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 <http://www.gnu.org/licenses/>. - -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: - - <program> Copyright (C) <year> <name of author> - 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 -<http://www.gnu.org/licenses/>. - - 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 -<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/common/dhash/COPYING.LESSER b/common/dhash/COPYING.LESSER deleted file mode 100644 index 755013bb2..000000000 --- a/common/dhash/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - 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 that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser 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 as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/common/dhash/Makefile.am b/common/dhash/Makefile.am deleted file mode 100644 index d5a561871..000000000 --- a/common/dhash/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -AM_CFLAGS = -if HAVE_GCC - AM_CFLAGS += \ - -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ - -Wcast-align -Wwrite-strings -endif - -ACLOCAL_AMFLAGS = -I m4 - -pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = dhash.pc - -dist_noinst_DATA = m4 - -dist_include_HEADERS = dhash.h - -lib_LTLIBRARIES = libdhash.la -libdhash_la_SOURCES = dhash.c -libdhash_la_LDFLAGS = \ - -version-info 1:0:0 - -check_PROGRAMS = dhash_test dhash_example -TESTS = $(check_PROGRAMS) - -dhash_test_SOURCES = examples/dhash_test.c -dhash_test_LDADD = dhash.o - -dhash_example_SOURCES = examples/dhash_example.c -dhash_example_LDADD = dhash.o - -examplesdir = $(docdir)/examples -dist_examples_DATA = examples/dhash_test.c examples/dhash_example.c -dist_doc_DATA = README - -tests: all $(check_PROGRAMS) diff --git a/common/dhash/README b/common/dhash/README deleted file mode 100644 index bee5024ee..000000000 --- a/common/dhash/README +++ /dev/null @@ -1 +0,0 @@ -Documentation for libdhash can be found in dhash.h diff --git a/common/dhash/configure.ac b/common/dhash/configure.ac deleted file mode 100644 index bf06cfc5a..000000000 --- a/common/dhash/configure.ac +++ /dev/null @@ -1,31 +0,0 @@ -AC_INIT([dhash], [0.4.0], [jdennis@redhat.com]) -AC_CONFIG_SRCDIR([dhash.c]) -AC_CONFIG_AUX_DIR([build]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -AC_PROG_CC -AC_PROG_LIBTOOL -AC_CONFIG_MACRO_DIR([m4]) -AC_PROG_INSTALL - -AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) - -m4_pattern_allow([AM_SILENT_RULES]) -AM_SILENT_RULES - -AC_CONFIG_HEADERS([config.h]) - -# Enable trace build -AC_ARG_ENABLE([trace], - [AS_HELP_STRING([--enable-trace[=LEVEL]],[build with low level tracing enabled])], - [trace_level="$enableval"], - [trace_level="0"]) -AS_IF([test ["$trace_level" -gt "0"] -a ["$trace_level" -lt "8"] ],[AC_SUBST([TRACE_VAR],["-DTRACE_LEVEL=$trace_level"])]) - -#Support old versions of autotools that don't provide docdir -AC_SUBST([docdir]) -if test x$docdir = x; then - AC_SUBST([docdir], ${datadir}/doc/AC_PACKAGE_NAME) -fi - -AC_CONFIG_FILES([Makefile dhash.pc]) -AC_OUTPUT diff --git a/common/dhash/dhash.c b/common/dhash/dhash.c deleted file mode 100644 index cb292b7be..000000000 --- a/common/dhash/dhash.c +++ /dev/null @@ -1,993 +0,0 @@ -/* - Authors: - John Dennis <jdennis.redhat.com> - Esmond Pitt <ejp@ausmelb.oz.AU> - - This implementation was based on a 3/7/1989 public domain submission - to comp.sources.misc by Esmond Pitt <ejp@ausmelb.oz.AU>. - - Copyright (C) 2009 Red Hat - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/*****************************************************************************/ -/******************************** Documentation ******************************/ -/*****************************************************************************/ - -/* - * See documentation in corresponding header file dhash.h. - * - * Compilation controls: - * DEBUG controls some informative traces, mainly for debugging. - * HASH_STATISTICS causes hash_accesses and hash_collisions to be maintained; - * when combined with DEBUG, these are displayed by hash_destroy(). - * - */ - -/*****************************************************************************/ -/******************************* Include Files *******************************/ -/*****************************************************************************/ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include "dhash.h" - -/*****************************************************************************/ -/****************************** Internal Defines *****************************/ -/*****************************************************************************/ - -#define PRIME_1 37 -#define PRIME_2 1048583 - - /* - * Fast arithmetic, relying on powers of 2, and on pre-processor - * concatenation property - */ - -#define halloc(table, size) table->halloc(size, table->halloc_pvt) -#define hfree(table, ptr) table->hfree(ptr, table->halloc_pvt) -#define hdelete_callback(table, type, entry) do { \ - if (table->delete_callback) { \ - table->delete_callback(entry, type, table->delete_pvt); \ - } \ -} while(0) - -/*****************************************************************************/ -/************************** Internal Type Definitions ************************/ -/*****************************************************************************/ - -typedef struct element_t { - hash_entry_t entry; - struct element_t *next; -} element_t, *segment_t; - - -struct hash_table_str { - unsigned long p; /* Next bucket to be split */ - unsigned long maxp; /* upper bound on p during expansion */ - unsigned long entry_count; /* current # entries */ - unsigned long bucket_count; /* current # buckets */ - unsigned long segment_count; /* current # segments */ - unsigned long min_load_factor; - unsigned long max_load_factor; - unsigned long directory_size; - unsigned int directory_size_shift; - unsigned long segment_size; - unsigned int segment_size_shift; - hash_delete_callback *delete_callback; - void *delete_pvt; - hash_alloc_func *halloc; - hash_free_func *hfree; - void *halloc_pvt; - segment_t **directory; -#ifdef HASH_STATISTICS - hash_statistics_t statistics; -#endif - -}; - -typedef unsigned long address_t; - -typedef struct hash_keys_callback_data_t { - unsigned long index; - hash_key_t *keys; -} hash_keys_callback_data_t; - -typedef struct hash_values_callback_data_t { - unsigned long index; - hash_value_t *values; -} hash_values_callback_data_t; - -struct _hash_iter_context_t { - struct hash_iter_context_t iter; - hash_table_t *table; - unsigned long i, j; - segment_t *s; - element_t *p; -}; - -/*****************************************************************************/ -/********************** External Function Declarations *********************/ -/*****************************************************************************/ - -/*****************************************************************************/ -/********************** Internal Function Declarations *********************/ -/*****************************************************************************/ - -static address_t convert_key(hash_key_t *key); -static address_t hash(hash_table_t *table, hash_key_t *key); -static bool key_equal(hash_key_t *a, hash_key_t *b); -static int contract_table(hash_table_t *table); -static int expand_table(hash_table_t *table); -static hash_entry_t *hash_iter_next(struct hash_iter_context_t *iter); - -/*****************************************************************************/ -/************************* External Global Variables ***********************/ -/*****************************************************************************/ - -/*****************************************************************************/ -/************************* Internal Global Variables ***********************/ -/*****************************************************************************/ - -#if DEBUG -int debug_level = 1; -#endif - -/*****************************************************************************/ -/*************************** Internal Functions ****************************/ -/*****************************************************************************/ - -static void *sys_malloc_wrapper(size_t size, void *pvt) -{ - return malloc(size); -} - -static void sys_free_wrapper(void *ptr, void *pvt) -{ - return free(ptr); -} - -static address_t convert_key(hash_key_t *key) -{ - address_t h; - unsigned char *k; - - switch(key->type) { - case HASH_KEY_ULONG: - h = key->ul; - break; - case HASH_KEY_STRING: - /* Convert string to integer */ - for (h = 0, k = (unsigned char *) key->str; *k; k++) - h = h * PRIME_1 ^ (*k - ' '); - break; - default: - h = key->ul; - break; - } - return h; -} - -static address_t hash(hash_table_t *table, hash_key_t *key) -{ - address_t h, address; - - h = convert_key(key); - h %= PRIME_2; - address = h & (table->maxp-1); /* h % maxp */ - if (address < table->p) - address = h & ((table->maxp << 1)-1); /* h % (2*table->maxp) */ - - return address; -} - -static bool is_valid_key_type(hash_key_enum key_type) -{ - switch(key_type) { - case HASH_KEY_ULONG: - case HASH_KEY_STRING: - return true; - default: - return false; - } -} - -static bool is_valid_value_type(hash_value_enum value_type) -{ - switch(value_type) { - case HASH_VALUE_UNDEF: - case HASH_VALUE_PTR: - case HASH_VALUE_INT: - case HASH_VALUE_UINT: - case HASH_VALUE_LONG: - case HASH_VALUE_ULONG: - case HASH_VALUE_FLOAT: - case HASH_VALUE_DOUBLE: - return true; - default: - return false; - } -} - -static bool key_equal(hash_key_t *a, hash_key_t *b) -{ - if (a->type != b->type) return false; - - switch(a->type) { - case HASH_KEY_ULONG: - return (a->ul == b->ul); - case HASH_KEY_STRING: - return (strcmp(a->str, b->str) == 0); - } - return false; -} - - -static int expand_table(hash_table_t *table) -{ - address_t new_address; - unsigned long old_segment_index, new_segment_index; - unsigned long old_segment_dir, new_segment_dir; - segment_t *old_segment, *new_segment; - element_t *current, **previous, **last_of_new; - - if (table->bucket_count < (table->directory_size << table->segment_size_shift)) { -#ifdef DEBUG - if (debug_level >= 1) - fprintf(stderr, "expand_table on entry: bucket_count=%lu, segment_count=%lu p=%lu maxp=%lu\n", - table->bucket_count, table->segment_count, table->p, table->maxp); -#endif -#ifdef HASH_STATISTICS - table->statistics.table_expansions++; -#endif - - /* - * Locate the bucket to be split - */ - old_segment_dir = table->p >> table->segment_size_shift; - old_segment = table->directory[old_segment_dir]; - old_segment_index = table->p & (table->segment_size-1); /* p % segment_size */ - /* - * Expand address space; if necessary create a new segment - */ - new_address = table->maxp + table->p; - new_segment_dir = new_address >> table->segment_size_shift; - new_segment_index = new_address & (table->segment_size-1); /* new_address % segment_size */ - if (new_segment_index == 0) { - table->directory[new_segment_dir] = (segment_t *)halloc(table, table->segment_size * sizeof(segment_t)); - if (table->directory[new_segment_dir] == NULL) { - return HASH_ERROR_NO_MEMORY; - } - memset(table->directory[new_segment_dir], 0, table->segment_size * sizeof(segment_t)); - table->segment_count++; - } - new_segment = table->directory[new_segment_dir]; - /* - * Adjust state variables - */ - table->p++; - if (table->p == table->maxp) { - table->maxp <<= 1; /* table->maxp *= 2 */ - table->p = 0; - } - table->bucket_count++; - /* - * Relocate records to the new bucket - */ - previous = &old_segment[old_segment_index]; - current = *previous; - last_of_new = &new_segment[new_segment_index]; - *last_of_new = NULL; - while (current != NULL) { - if (hash(table, ¤t->entry.key) == new_address) { - /* - * Attach it to the end of the new chain - */ - *last_of_new = current; - /* - * Remove it from old chain - */ - *previous = current->next; - last_of_new = ¤t->next; - current = current->next; - *last_of_new = NULL; - } else { - /* - * leave it on the old chain - */ - previous = ¤t->next; - current = current->next; - } - } -#ifdef DEBUG - if (debug_level >= 1) - fprintf(stderr, "expand_table on exit: bucket_count=%lu, segment_count=%lu p=%lu maxp=%lu\n", - table->bucket_count, table->segment_count, table->p, table->maxp); -#endif - } - return HASH_SUCCESS; -} - -static int contract_table(hash_table_t *table) -{ - address_t new_address, old_address; - unsigned long old_segment_index, new_segment_index; - unsigned long old_segment_dir, new_segment_dir; - segment_t *old_segment, *new_segment; - element_t *current; - - if (table->bucket_count > table->segment_size) { -#ifdef DEBUG - if (debug_level >= 1) - fprintf(stderr, "contract_table on entry: bucket_count=%lu, segment_count=%lu p=%lu maxp=%lu\n", - table->bucket_count, table->segment_count, table->p, table->maxp); -#endif - -#ifdef HASH_STATISTICS - table->statistics.table_contractions++; -#endif - /* - * Locate the bucket to be merged with the last bucket - */ - old_address = table->bucket_count - 1; - old_segment_dir = old_address >> table->segment_size_shift; - old_segment = table->directory[old_segment_dir]; - old_segment_index = old_address & (table->segment_size-1); /* old_address % segment_size */ - - /* - * Adjust state variables - */ - if (table->p > 0) { - table->p--; - } else { - table->maxp >>= 1; - table->p = table->maxp - 1; - } - table->bucket_count--; - - /* - * Find the last bucket to merge back - */ - if((current = old_segment[old_segment_index]) != NULL) { - new_address = hash(table, &old_segment[old_segment_index]->entry.key); - new_segment_dir = new_address >> table->segment_size_shift; - new_segment_index = new_address & (table->segment_size-1); /* new_address % segment_size */ - new_segment = table->directory[new_segment_dir]; - - /* - * Relocate records to the new bucket by splicing the two chains - * together by inserting the old chain at the head of the new chain. - * First find the end of the old chain, then set its next pointer to - * point to the head of the new chain, set the head of the new chain to - * point to the old chain, then finally set the head of the old chain to - * NULL. - */ - - while (current->next != NULL) { - current = current->next; - } - - current->next = new_segment[new_segment_index]; - new_segment[new_segment_index] = old_segment[old_segment_index]; - old_segment[old_segment_index] = NULL; - } - /* - * If we have removed the last of the chains in this segment then free the - * segment since its no longer in use. - */ - if (old_segment_index == 0) { - table->segment_count--; - hfree(table, table->directory[old_segment_dir]); - } - -#ifdef DEBUG - if (debug_level >= 1) - fprintf(stderr, "contract_table on exit: bucket_count=%lu, segment_count=%lu p=%lu maxp=%lu\n", - table->bucket_count, table->segment_count, table->p, table->maxp); -#endif - - } - return HASH_SUCCESS; -} - -static int lookup(hash_table_t *table, hash_key_t *key, element_t **element_arg, segment_t **chain_arg) -{ - address_t h; - segment_t *current_segment; - unsigned long segment_index, segment_dir; - segment_t *chain, element; - - *element_arg = NULL; - *chain_arg = NULL; - - if (!table) return HASH_ERROR_BAD_TABLE; - -#ifdef HASH_STATISTICS - table->statistics.hash_accesses++; -#endif - h = hash(table, key); - segment_dir = h >> table->segment_size_shift; - segment_index = h & (table->segment_size-1); /* h % segment_size */ - /* - * valid segment ensured by hash() - */ - current_segment = table->directory[segment_dir]; - -#ifdef DEBUG - if (debug_level >= 2) - fprintf(stderr, "lookup: h=%lu, segment_dir=%lu, segment_index=%lu current_segment=%p\n", - h, segment_dir, segment_index, current_segment); -#endif - - if (current_segment == NULL) return EFAULT; - chain = ¤t_segment[segment_index]; - element = *chain; - /* - * Follow collision chain - */ - while (element != NULL && !key_equal(&element->entry.key, key)) { - chain = &element->next; - element = *chain; -#ifdef HASH_STATISTICS - table->statistics.hash_collisions++; -#endif - } - *element_arg = element; - *chain_arg = chain; - - return HASH_SUCCESS; -} - -static bool hash_keys_callback(hash_entry_t *item, void *user_data) -{ - hash_keys_callback_data_t *data = (hash_keys_callback_data_t *)user_data; - - data->keys[data->index++] = item->key; - return true; -} - -static bool hash_values_callback(hash_entry_t *item, void *user_data) -{ - hash_values_callback_data_t *data = (hash_values_callback_data_t *)user_data; - - data->values[data->index++] = item->value; - return true; -} - -/*****************************************************************************/ -/**************************** Exported Functions ***************************/ -/*****************************************************************************/ - -const char* hash_error_string(int error) -{ - switch(error) { - case HASH_SUCCESS: return "Success"; - case HASH_ERROR_BAD_KEY_TYPE: return "Bad key type"; - case HASH_ERROR_BAD_VALUE_TYPE: return "Bad value type"; - case HASH_ERROR_NO_MEMORY: return "No memory"; - case HASH_ERROR_KEY_NOT_FOUND: return "Key not found"; - case HASH_ERROR_BAD_TABLE: return "Bad table"; - } - return NULL; -} - - -int hash_create(unsigned long count, hash_table_t **tbl, - hash_delete_callback *delete_callback, - void *delete_private_data) -{ - return hash_create_ex(count, tbl, 0, 0, 0, 0, - NULL, NULL, NULL, - delete_callback, - delete_private_data); -} - -int hash_create_ex(unsigned long count, hash_table_t **tbl, - unsigned int directory_bits, - unsigned int segment_bits, - unsigned long min_load_factor, - unsigned long max_load_factor, - hash_alloc_func *alloc_func, - hash_free_func *free_func, - void *alloc_private_data, - hash_delete_callback *delete_callback, - void *delete_private_data) -{ - unsigned long i; - unsigned int n_addr_bits; - address_t addr; - hash_table_t *table = NULL; - - if (alloc_func == NULL) alloc_func = sys_malloc_wrapper; - if (free_func == NULL) free_func = sys_free_wrapper; - - /* Compute directory and segment parameters */ - if (directory_bits == 0) directory_bits = HASH_DEFAULT_DIRECTORY_BITS; - if (segment_bits == 0) segment_bits = HASH_DEFAULT_SEGMENT_BITS; - - for (addr = ~0, n_addr_bits = 0; addr; addr >>= 1, n_addr_bits++); - - if (directory_bits + segment_bits > n_addr_bits) return EINVAL; - - table = (hash_table_t *)alloc_func(sizeof(hash_table_t), - alloc_private_data); - if (table == NULL) { - return HASH_ERROR_NO_MEMORY; - } - memset(table, 0, sizeof(hash_table_t)); - table->halloc = alloc_func; - table->hfree = free_func; - table->halloc_pvt = alloc_private_data; - - table->directory_size_shift = directory_bits; - for (i = 0, table->directory_size = 1; i < table->directory_size_shift; i++, table->directory_size <<= 1); - - table->segment_size_shift = segment_bits; - for (i = 0, table->segment_size = 1; i < table->segment_size_shift; i++, table->segment_size <<= 1); - - - /* Allocate directory */ - table->directory = (segment_t **)halloc(table, table->directory_size * sizeof(segment_t *)); - if (table->directory == NULL) { - return HASH_ERROR_NO_MEMORY; - } - memset(table->directory, 0, table->directory_size * sizeof(segment_t *)); - - /* - * Adjust count to be nearest higher power of 2, minimum SEGMENT_SIZE, then - * convert into segments. - */ - i = table->segment_size; - while (i < count) - i <<= 1; - count = i >> table->segment_size_shift; - - table->segment_count = 0; - table->p = 0; - table->entry_count = 0; - table->delete_callback = delete_callback; - table->delete_pvt = delete_private_data; - - /* - * Allocate initial 'i' segments of buckets - */ - for (i = 0; i < count; i++) { - table->directory[i] = (segment_t *)halloc(table, table->segment_size * sizeof(segment_t)); - if (table->directory[i] == NULL) { - hash_destroy(table); - return HASH_ERROR_NO_MEMORY; - } - memset(table->directory[i], 0, table->segment_size * sizeof(segment_t)); - table->segment_count++; - } - table->bucket_count = table->segment_count << table->segment_size_shift; - table->maxp = table->bucket_count; - table->min_load_factor = min_load_factor == 0 ? HASH_DEFAULT_MIN_LOAD_FACTOR : min_load_factor; - table->max_load_factor = max_load_factor == 0 ? HASH_DEFAULT_MAX_LOAD_FACTOR : max_load_factor; - -#if DEBUG - if (debug_level >= 1) - fprintf(stderr, "hash_create_ex: table=%p count=%lu maxp=%lu segment_count=%lu\n", - table, count, table->maxp, table->segment_count); -#endif -#ifdef HASH_STATISTICS - memset(&table->statistics, 0, sizeof(table->statistics)); -#endif - - *tbl = table; - return HASH_SUCCESS; -} - -#ifdef HASH_STATISTICS -int hash_get_statistics(hash_table_t *table, hash_statistics_t *statistics) -{ - if (!table) return HASH_ERROR_BAD_TABLE; - if (!statistics) return EINVAL; - - *statistics = table->statistics; - - return HASH_SUCCESS; -} -#endif - -int hash_destroy(hash_table_t *table) -{ - unsigned long i, j; - segment_t *s; - element_t *p, *q; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (table != NULL) { - for (i = 0; i < table->segment_count; i++) { - /* test probably unnecessary */ - if ((s = table->directory[i]) != NULL) { - for (j = 0; j < table->segment_size; j++) { - p = s[j]; - while (p != NULL) { - q = p->next; - hdelete_callback(table, HASH_TABLE_DESTROY, &p->entry); - if (p->entry.key.type == HASH_KEY_STRING) { - hfree(table, (char *)p->entry.key.str); - } - hfree(table, (char *)p); - p = q; - } - } - hfree(table, s); - } - } - hfree(table, table->directory); - hfree(table, table); - table = NULL; - } - return HASH_SUCCESS; -} - -int hash_iterate(hash_table_t *table, hash_iterate_callback callback, void *user_data) -{ - unsigned long i, j; - segment_t *s; - element_t *p; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (table != NULL) { - for (i = 0; i < table->segment_count; i++) { - /* test probably unnecessary */ - if ((s = table->directory[i]) != NULL) { - for (j = 0; j < table->segment_size; j++) { - p = s[j]; - while (p != NULL) { - if(!(*callback)(&p->entry, user_data)) return HASH_SUCCESS; - p = p->next; - } - } - } - } - } - return HASH_SUCCESS; -} - -static hash_entry_t *hash_iter_next(struct hash_iter_context_t *iter_arg) -{ - struct _hash_iter_context_t *iter = (struct _hash_iter_context_t *) iter_arg; - hash_entry_t *entry; - - if (iter->table == NULL) return NULL; - goto state_3a; - - state_1: - iter->i++; - if(iter->i >= iter->table->segment_count) return NULL; - /* test probably unnecessary */ - iter->s = iter->table->directory[iter->i]; - if (iter->s == NULL) goto state_1; - iter->j = 0; - state_2: - if (iter->j >= iter->table->segment_size) goto state_1; - iter->p = iter->s[iter->j]; - state_3a: - if (iter->p == NULL) goto state_3b; - entry = &iter->p->entry; - iter->p = iter->p->next; - return entry; - state_3b: - iter->j++; - goto state_2; - - /* Should never reach here */ - fprintf(stderr, "ERROR hash_iter_next reached invalid state\n"); - return NULL; -} - -struct hash_iter_context_t *new_hash_iter_context(hash_table_t *table) -{ - struct _hash_iter_context_t *iter; - - if (!table) return NULL;; - - iter = halloc(table, sizeof(struct _hash_iter_context_t)); - if (iter == NULL) { - return NULL; - } - - - iter->iter.next = (hash_iter_next_t) hash_iter_next; - - iter->table = table; - iter->i = 0; - iter->j = 0; - iter->s = table->directory[iter->i]; - iter->p = iter->s[iter->j]; - - return (struct hash_iter_context_t *)iter; -} - -unsigned long hash_count(hash_table_t *table) -{ - return table->entry_count; -} - - -int hash_keys(hash_table_t *table, unsigned long *count_arg, hash_key_t **keys_arg) -{ - unsigned long count = table->entry_count; - hash_key_t *keys; - hash_keys_callback_data_t data; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (count == 0) { - *count_arg = 0; - *keys_arg = NULL; - return HASH_SUCCESS; - } - - keys = halloc(table, sizeof(hash_key_t) * count); - if (keys == NULL) { - *count_arg = -1; - *keys_arg = NULL; - return HASH_ERROR_NO_MEMORY; - } - - data.index = 0; - data.keys = keys; - - hash_iterate(table, hash_keys_callback, &data); - - *count_arg = count; - *keys_arg = keys; - return HASH_SUCCESS; -} - -int hash_values(hash_table_t *table, unsigned long *count_arg, hash_value_t **values_arg) -{ - unsigned long count = table->entry_count; - hash_value_t *values; - hash_values_callback_data_t data; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (count == 0) { - *count_arg = 0; - *values_arg = NULL; - return HASH_SUCCESS; - } - - values = halloc(table, sizeof(hash_value_t) * count); - if (values == NULL) { - *count_arg = -1; - *values_arg = NULL; - return HASH_ERROR_NO_MEMORY; - } - - data.index = 0; - data.values = values; - - hash_iterate(table, hash_values_callback, &data); - - *count_arg = count; - *values_arg = values; - return HASH_SUCCESS; -} - -typedef struct hash_entries_callback_data_t { - unsigned long index; - hash_entry_t *entries; -} hash_entries_callback_data_t; - -static bool hash_entries_callback(hash_entry_t *item, void *user_data) -{ - hash_entries_callback_data_t *data = (hash_entries_callback_data_t *)user_data; - - data->entries[data->index++] = *item; - return true; -} - -int hash_entries(hash_table_t *table, unsigned long *count_arg, hash_entry_t **entries_arg) -{ - unsigned long count = table->entry_count; - hash_entry_t *entries; - hash_entries_callback_data_t data; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (count == 0) { - *count_arg = 0; - *entries_arg = NULL; - return HASH_SUCCESS; - } - - entries = halloc(table, sizeof(hash_entry_t) * count); - if (entries == NULL) { - *count_arg = -1; - *entries_arg = NULL; - return HASH_ERROR_NO_MEMORY; - } - - data.index = 0; - data.entries = entries; - - hash_iterate(table, hash_entries_callback, &data); - - *count_arg = count; - *entries_arg = entries; - return HASH_SUCCESS; -} - -bool hash_has_key(hash_table_t *table, hash_key_t *key) -{ - hash_value_t value; - - if (hash_lookup(table, key, &value) == HASH_SUCCESS) - return true; - else - return false; -} - - -int hash_get_default(hash_table_t *table, hash_key_t *key, hash_value_t *value, hash_value_t *default_value) -{ - int error; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if ((error = hash_lookup(table, key, value)) != HASH_SUCCESS) { - if ((error = hash_enter(table, key, default_value)) != HASH_SUCCESS) { - return error; - } - *value = *default_value; - return HASH_SUCCESS; - } - - return HASH_SUCCESS; -} - -int hash_enter(hash_table_t *table, hash_key_t *key, hash_value_t *value) -{ - int error; - segment_t element, *chain; - size_t len; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (!is_valid_key_type(key->type)) - return HASH_ERROR_BAD_KEY_TYPE; - - if (!is_valid_value_type(value->type)) - return HASH_ERROR_BAD_VALUE_TYPE; - - lookup(table, key, &element, &chain); - - if (element == NULL) { /* not found */ - element = (element_t *)halloc(table, sizeof(element_t)); - if (element == NULL) { - /* Allocation failed, return NULL */ - return HASH_ERROR_NO_MEMORY; - } - memset(element, 0, sizeof(element_t)); - /* - * Initialize new element - */ - switch(element->entry.key.type = key->type) { - case HASH_KEY_ULONG: - element->entry.key.ul = key->ul; - break; - case HASH_KEY_STRING: - len = strlen(key->str)+1; - element->entry.key.str = halloc(table, len); - if (element->entry.key.str == NULL) { - hfree(table, element); - return HASH_ERROR_NO_MEMORY; - } - memcpy((void *)element->entry.key.str, key->str, len); - break; - } - switch(element->entry.value.type = value->type) { - case HASH_VALUE_UNDEF: - element->entry.value.ul = 0; - break; - case HASH_VALUE_PTR: - element->entry.value.ptr = value->ptr; - break; - case HASH_VALUE_INT: - element->entry.value.i = value->i; - break; - case HASH_VALUE_UINT: - element->entry.value.ui = value->ui; - break; - case HASH_VALUE_LONG: - element->entry.value.l = value->l; - break; - case HASH_VALUE_ULONG: - element->entry.value.ul = value->ul; - break; - case HASH_VALUE_FLOAT: - element->entry.value.f = value->f; - break; - case HASH_VALUE_DOUBLE: - element->entry.value.d = value->d; - break; - } - *chain = element; /* link into chain */ - element->next = NULL; - /* - * Table over-full? - */ - if (++table->entry_count / table->bucket_count > table->max_load_factor) { - if ((error = expand_table(table)) != HASH_SUCCESS) { /* doesn't affect element */ - return error; - } - } - } /* end not found */ - return HASH_SUCCESS; -} - -int hash_lookup(hash_table_t *table, hash_key_t *key, hash_value_t *value) -{ - segment_t element, *chain; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (!is_valid_key_type(key->type)) - return HASH_ERROR_BAD_KEY_TYPE; - - lookup(table, key, &element, &chain); - - if (element) { - *value = element->entry.value; - return HASH_SUCCESS; - } else { - return HASH_ERROR_KEY_NOT_FOUND; - } -} - -int hash_delete(hash_table_t *table, hash_key_t *key) -{ - int error; - segment_t element, *chain; - - if (!table) return HASH_ERROR_BAD_TABLE; - - if (!is_valid_key_type(key->type)) - return HASH_ERROR_BAD_KEY_TYPE; - - lookup(table, key, &element, &chain); - - if (element) { - hdelete_callback(table, HASH_ENTRY_DESTROY, &element->entry); - *chain = element->next; /* remove from chain */ - /* - * Table too sparse? - */ - if (--table->entry_count / table->bucket_count < table->min_load_factor) { - if ((error = contract_table(table)) != HASH_SUCCESS) { /* doesn't affect element */ - return error; - } - } - if (element->entry.key.type == HASH_KEY_STRING) { - hfree(table, (char *)element->entry.key.str); - } - hfree(table, element); - return HASH_SUCCESS; - } else { - return HASH_ERROR_KEY_NOT_FOUND; - } -} - - diff --git a/common/dhash/dhash.h b/common/dhash/dhash.h deleted file mode 100644 index 70d083e3c..000000000 --- a/common/dhash/dhash.h +++ /dev/null @@ -1,391 +0,0 @@ -/* - Authors: - John Dennis <jdennis.redhat.com> - Esmond Pitt <ejp@ausmelb.oz.AU> - - This implementation was based on a 3/7/1989 public domain submission - to comp.sources.misc by Esmond Pitt <ejp@ausmelb.oz.AU>. - - Copyright (C) 2009 Red Hat - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef DHASH_H -#define DHASH_H - -/*****************************************************************************/ -/******************************** Documentation ******************************/ -/*****************************************************************************/ - -#if 0 - -Dynamic hash table implementation based on article in CACM April 1988 pp. -446-457, by Per-Ake Larson. - -This implementation was based on a 3/7/1989 submission to comp.sources.misc by -Esmond Pitt (ejp@ausmelb.oz.AU) that emulated the hsearch(3) interface. The interface -was reworked to be much more flexible and significant new functionality was -added by John Dennis (jdennis@sharpeye.com). - -A hash table maintains a set of <key,value> pairs. Lookups are performed by -locating the key in the table and returning its value. - -A dynamic hash table keeps the number of hash collisions constant -independent of the number of entries in the hash table. - -Both keys and values may be of different types. Two different key types are -supported, strings and unsigned longs. If the key type is a string the hash -library will automatically allocate memory to hold the hash key string and -will automatically free the memory for the key string when the hash entry -is destroyed. Items in the hash table only match when their key types match -AND the keys themselves match. For example if there were two hash entries, -one whose key type was an unsigned long equal to 1 and one whose key type was -a string equal to "1" they would not match, these are considered two -distinct entries. - -The value of the key may be a undefined, pointer, an int, an unsigned int, a -long, an unsigned long, a float, or a double. The hash library does nothing -with user pointers (value.type == HASH_VALUE_PTR). Its the user responsibility -to free items pointed to by these pointers when a hash entry is deleted or the -hash table is destroyed (see hash_delete_callback and/or hash_destroy). - -See dhash_example.c for an illustration of how one might use the API. It does not -represent complete API coverage nor the optimal way to do things in all cases, -it is just a general example. - -Copyright 2009-1010 John Dennis -This program is distributed under the terms of the GNU Lesser General Public -License (LGPL). See the included COPYING and COPYING.lesser files for the -terms of this license. - -#endif - -/*****************************************************************************/ -/******************************* Include Files *******************************/ -/*****************************************************************************/ - -#include <stdbool.h> - -/*****************************************************************************/ -/*********************************** Defines *********************************/ -/*****************************************************************************/ - -#if 1 -#define HASH_STATISTICS -#endif - -#define HASH_DEFAULT_DIRECTORY_BITS 5 -#define HASH_DEFAULT_SEGMENT_BITS 5 -#define HASH_DEFAULT_MIN_LOAD_FACTOR 1 -#define HASH_DEFAULT_MAX_LOAD_FACTOR 5 - -#define HASH_ERROR_BASE -2000 -#define HASH_ERROR_LIMIT (HASH_ERROR_BASE+20) -#define IS_HASH_ERROR(error) (((error) >= HASH_ERROR_BASE) && ((error) < HASH_ERROR_LIMIT)) - -#define HASH_SUCCESS 0 -#define HASH_ERROR_BAD_KEY_TYPE (HASH_ERROR_BASE + 1) -#define HASH_ERROR_BAD_VALUE_TYPE (HASH_ERROR_BASE + 2) -#define HASH_ERROR_NO_MEMORY (HASH_ERROR_BASE + 3) -#define HASH_ERROR_KEY_NOT_FOUND (HASH_ERROR_BASE + 4) -#define HASH_ERROR_BAD_TABLE (HASH_ERROR_BASE + 5) - -/*****************************************************************************/ -/******************************* Type Definitions ****************************/ -/*****************************************************************************/ - -struct hash_table_str; -typedef struct hash_table_str hash_table_t; - -typedef enum { - HASH_KEY_STRING, - HASH_KEY_ULONG -} hash_key_enum; - -typedef enum -{ - HASH_VALUE_UNDEF, - HASH_VALUE_PTR, - HASH_VALUE_INT, - HASH_VALUE_UINT, - HASH_VALUE_LONG, - HASH_VALUE_ULONG, - HASH_VALUE_FLOAT, - HASH_VALUE_DOUBLE -} hash_value_enum; - -typedef enum -{ - HASH_TABLE_DESTROY, - HASH_ENTRY_DESTROY -} hash_destroy_enum; - -typedef struct hash_key_t { - hash_key_enum type; - union { - char *str; - unsigned long ul; - }; -} hash_key_t; - -typedef struct hash_value_t { - hash_value_enum type; - union { - void *ptr; - int i; - unsigned int ui; - long l; - unsigned long ul; - float f; - double d; - }; -} hash_value_t; - -typedef struct hash_entry_t { - hash_key_t key; - hash_value_t value; -} hash_entry_t; - -#ifdef HASH_STATISTICS -typedef struct hash_statistics_t { - unsigned long hash_accesses; - unsigned long hash_collisions; - unsigned long table_expansions; - unsigned long table_contractions; -} hash_statistics_t; -#endif - - -/* typedef's for callback based iteration */ -typedef bool(*hash_iterate_callback)(hash_entry_t *item, void *user_data); -typedef void (hash_delete_callback)(hash_entry_t *item, - hash_destroy_enum type, void *pvt); - -/* typedef's for iteration object based iteration */ -struct hash_iter_context_t; -typedef hash_entry_t *(*hash_iter_next_t)(struct hash_iter_context_t *iter); -struct hash_iter_context_t { - hash_iter_next_t next; -}; - -/* typedef for hash_create_ex() */ -typedef void *(hash_alloc_func)(size_t size, void *pvt); -typedef void (hash_free_func)(void *ptr, void *pvt); - -/*****************************************************************************/ -/************************* External Global Variables ***********************/ -/*****************************************************************************/ - -/*****************************************************************************/ -/**************************** Exported Functions ***************************/ -/*****************************************************************************/ - -/* - * Given an error code returned by a hash function, map it to a error string. - * Returns NULL if the error code is unrecognized. - */ -const char* hash_error_string(int error); - -/* - * Create a new hash table with room for n initial entries. hash_create returns - * an opaque pointer to the new hash table in the table parameter. Functions - * operating on the hash table pass in this hash table pointer. This means you - * may have as many concurrent hash tables as you want. The delete_callback - * parameter is a pointer to a function which will be called just prior to a - * hash entry being deleted. This is useful when the hash value has items which - * may need to be disposed of. The delete_callback may be NULL. - * The delete_private_data is data passed to the delete_callback, this way - * custom callbacks can have a private context to reach data they need to use - * before performning their operations. delete_private_data may be NULL. - */ -int hash_create(unsigned long count, hash_table_t **tbl, - hash_delete_callback *delete_callback, - void *delete_private_data); - -/* - * Create a new hash table and fine tune it's configurable parameters. - * Refer to CACM article for explanation of parameters. - * - * directory_bits: number of address bits allocated to top level directory array. - * segment_bits: number of address bits allocated to segment array. - * min_load_factor: table contracted when the ratio of entry count to bucket count - * is less than the min_load_factor the table is contracted. - * max_load_factor: table expanded when the ratio of entry count to bucket count - * is greater than the max_load_factor the table is expanded. - * alloc_func: function pointer for allocation - * free_func: funciton pointer for freeing memory allocated with alloc_func - * alloc_private data: data passed to the alloc and free functions so that - * custom functions can refernce other private data they may - * need during their execution without having to use global - * variables. - * - * Note directory_bits + segment_bits must be <= number of bits in unsigned long - */ -int hash_create_ex(unsigned long count, hash_table_t **tbl, - unsigned int directory_bits, - unsigned int segment_bits, - unsigned long min_load_factor, - unsigned long max_load_factor, - hash_alloc_func *alloc_func, - hash_free_func *free_func, - void *alloc_private_data, - hash_delete_callback *delete_callback, - void *delete_private_data); - -#ifdef HASH_STATISTICS -/* - * Return statistics for the table. - */ -int hash_get_statistics(hash_table_t *table, hash_statistics_t *statistics); -#endif - -/* - * hash_destroy deletes all entries in the hash table, freeing all memory used - * in implementing the hash table. Some hash entries may have values which are - * pointers to user data structures. User pointers are not free by hash_destroy, - * they must be free by the caller. This may be done by iterating over all the - * entries in the table using hash_iterate() and freeing the values or by - * registering a delete callback when the table is created with - * hash_create(). Note, hash keys which are strings will be automatically freed - * by hash_destroy, the caller does not need to free the key strings. - */ -int hash_destroy(hash_table_t *table); - -/* - * Enter or update an item in the table referenced by key. If the key does not - * exist yet the item will be created and inserted into the table with the - * value, otherwise the value for the existing key is updated. The return value - * may be HASH_ERROR_BAD_KEY_TYPE or HASH_ERROR_BAD_VALUE_TYPE if the key or - * value type respectively is invalid. This function might also return - * HASH_ERROR_NO_MEMORY. - */ -int hash_enter(hash_table_t *table, hash_key_t *key, hash_value_t *value); - -/* - * Using the key lookup the value associated with it in the table. If the key is - * not in the table HASH_ERROR_KEY_NOT_FOUND is returned. If the type of key is - * invalid HASH_ERROR_BAD_KEY_TYPE is returned. Otherwise HASH_SUCCESS is - * returned. If the result is anything other than HASH_SUCCESS the value pointer - * is not updated. - */ -int hash_lookup(hash_table_t *table, hash_key_t *key, hash_value_t *value); - -/* - * Like hash_lookup() except if the key is not in the table then it is entered - * into the table and assigned the default_value. Thus it is not possible for - * hash_get_default() to return HASH_ERROR_KEY_NOT_FOUND. - */ -int hash_get_default(hash_table_t *table, hash_key_t *key, hash_value_t *value, hash_value_t *default_value); - -/* - * Delete the item from the table. The key and its type are specified in the key - * parameter which are passed by reference. If the key was in the table - * HASH_SUCCESS is returned otherwise HASH_ERROR_KEY_NOT_FOUND is - * returned. Memory allocated to hold the key if it was a string is free by the - * hash library, but values which are pointers to user data must be freed by the - * caller (see delete_callback). - */ -int hash_delete(hash_table_t *table, hash_key_t *key); - -/* - * Often it is useful to operate on every key and/or value in the hash - * table. The hash_iterate function will invoke the users callback on every item - * in the table as long as the callback returns a non-zero value. Returning a - * zero from the callback can be used to halt the iteration prematurely if some - * condition is met. The user_data parameter is passed to the callback - * function. It can be used for any purpose the caller wants. The callback - * parameter list is: - * - * bool callback(hash_entry_t *item, hash_table_t *user_data); - * - * WARNING: Do not modify the contents of the table during an iteration it will - * produce undefined results. If you need to visit each item in the table and - * potentially delete or insert some entries the proper way to do this is to - * obtain a list of keys or items using hash_keys() or hash_items() which - * returns a copy of the keys or items. You may then loop on the list returned - * and safely update the table (don't forget to free the list when done). - */ -int hash_iterate(hash_table_t *table, hash_iterate_callback callback, void *user_data); - -/* - * This is another method to iterate on every key/value in the hash table. - * However, unlike hash_iterate which requires a callback this function returns - * an iterator object which contains a next() function pointer. Each time - * next() is invoked it returns a pointer to the next hash entry in the table, - * then NULL when all entries have been visited. In some circumstances it's more - * convenient than having to define a callback. Like hash_iterate() one must - * never modify the table contents during iteration. If you intend to modify the - * table during iteration use the functions which return an indepent list of - * keys, values, or items instead and iterate on the list. The iterator object - * must be free'ed when you're done iterating by calling free() on it. - * - * Example: - * - * struct hash_iter_context_t *iter; - * hash_entry_t *entry; - * - * iter = new_hash_iter_context(table); - * while ((entry = iter->next(iter)) != NULL) { - * do_something(entry); - * } - * free(iter); - */ -struct hash_iter_context_t *new_hash_iter_context(hash_table_t *table); - -/* - * Return a count of how many items are currently in the table. - */ -unsigned long hash_count(hash_table_t *table); - -/* - * Get an array of all the keys in the table returned through the keys - * parameter. The number of elements in the array is returned in the count - * parameter. Each key in the array is a copy of the key in the table. Any - * pointers in the key will be shared with the table entry thus both the item in - * the array and the item in the table point to the same object. The array - * should be freed by calling free(). The function may return - * HASH_ERROR_NO_MEMORY, otherwise HASH_SUCCESS. - */ -int hash_keys(hash_table_t *table, unsigned long *count, hash_key_t **keys); - -/* - * Get an array of all the values in the table returned through the values - * parameter. The number of elements in the array is returned in the count - * parameter. Each value in the array is a copy of the value in the table. Any - * pointers in the value will be shared with the table entry thus both the item in - * the array and the item in the table point to the same object. The array - * should be freed by calling free(). The function may return - * HASH_ERROR_NO_MEMORY, otherwise HASH_SUCCESS. - */ -int hash_values(hash_table_t *table, unsigned long *count, hash_value_t **values); - - -/* - * Get an array of all the entries in the table returned through the entries - * parameter. The number of elements in the array is returned in the count - * parameter. Each entry in the array is a copy of the entry in the table. Any - * pointers in the entry will be shared with the table entry thus both the item in - * the array and the item in the table point to the same object. The array - * should be freed by calling free(). The function may return - * HASH_ERROR_NO_MEMORY, otherwise HASH_SUCCESS. - */ -int hash_entries(hash_table_t *table, unsigned long *count, hash_entry_t **entries); - -/* - * Return boolean if the key is in the table. - */ -bool hash_has_key(hash_table_t *table, hash_key_t *key); - -#endif diff --git a/common/dhash/dhash.pc.in b/common/dhash/dhash.pc.in deleted file mode 100644 index 7dfc8a35d..000000000 --- a/common/dhash/dhash.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: A hash table which will dynamically resize to achieve optimal storage & access time properties -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -ldhash -Cflags: -I${includedir} -URL: http://fedorahosted.org/sssd/ diff --git a/common/dhash/examples/dhash_example.c b/common/dhash/examples/dhash_example.c deleted file mode 100644 index bd0ca8eb5..000000000 --- a/common/dhash/examples/dhash_example.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - Authors: - John Dennis <jdennis.redhat.com> - - Copyright (C) 2009 Red Hat - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <assert.h> -#include "dhash.h" - -struct my_data_t { - int foo; - char bar[128]; -}; - -void delete_callback(hash_entry_t *entry, hash_destroy_enum type, void *pvt) -{ - if (entry->value.type == HASH_VALUE_PTR) free(entry->value.ptr); -} - -bool visit_callback(hash_entry_t *entry, void *user_data) -{ - unsigned long *count = (unsigned long *)user_data; - struct my_data_t *my_data = (struct my_data_t *) entry->value.ptr; - - (*count)++; - - printf("%s = [foo=%d bar=%s]\n", entry->key.str, my_data->foo, my_data->bar); - return true; -} - -struct my_data_t *new_data(int foo, const char *bar) -{ - struct my_data_t *my_data = malloc(sizeof(struct my_data_t)); - my_data->foo = foo; - strncpy(my_data->bar, bar, sizeof(my_data->bar)); - return my_data; -} -int main(int argc, char **argv) -{ - static hash_table_t *table = NULL; - hash_key_t key, *keys; - hash_value_t value; - struct hash_iter_context_t *iter; - hash_entry_t *entry; - unsigned long i, n_entries; - int error; - struct my_data_t *my_data = new_data(1024, "Hello World!"); - unsigned long count; - - /* Create a hash table */ - error = hash_create(10, &table, delete_callback, NULL); - if (error != HASH_SUCCESS) { - fprintf(stderr, "cannot create hash table (%s)\n", hash_error_string(error)); - return error; - } - - /* Enter a key named "My Data" and specify it's value as a pointer to my_data */ - key.type = HASH_KEY_STRING; - key.str = strdup("My Data"); - value.type = HASH_VALUE_PTR; - value.ptr = my_data; - - if ((error = hash_enter(table, &key, &value)) != HASH_SUCCESS) { - fprintf(stderr, "cannot add to table \"%s\" (%s)\n", key.str, hash_error_string(error)); - return error; - } - - /* Get a list of keys and print them out, free the list when we're done */ - if ((error = hash_keys(table, &count, &keys)) != HASH_SUCCESS) { - fprintf(stderr, "cannot get key list (%s)\n", hash_error_string(error)); - return error; - } - - for (i = 0; i < count; i++) - printf("key: %s\n", keys[i].str); - free(keys); - - /* Lookup the key named "My Data" */ - key.type = HASH_KEY_STRING; - key.str = strdup("My Data"); - if ((error = hash_lookup(table, &key, &value)) != HASH_SUCCESS) { - fprintf(stderr, "cannot find key \"%s\" (%s)\n", key.str, hash_error_string(error)); - } - - /* Visit each entry in the table, callback will increment count on each visit */ - printf("Iterate using callback\n"); - count = 0; - hash_iterate(table, visit_callback, &count); - - /* Assure number of visits equal the table size */ - assert(count == hash_count(table)); - - /* Visit each entry using iterator object */ - printf("Iterate using iterator\n"); - n_entries = 0; - iter = new_hash_iter_context(table); - while ((entry = iter->next(iter)) != NULL) { - struct my_data_t *data = (struct my_data_t *) entry->value.ptr; - - printf("%s = [foo=%d bar=%s]\n", entry->key.str, data->foo, data->bar); - n_entries++; - } - free(iter); - /* Assure number of visits equal the table size */ - assert(n_entries == hash_count(table)); - - /* Remove the entry, deletion callback will be invoked */ - key.type = HASH_KEY_STRING; - key.str = strdup("My Data"); - if ((error = hash_delete(table, &key)) != HASH_SUCCESS) { - fprintf(stderr, "cannot delete from table (%s)\n", hash_error_string(error)); - } - - /* Assure key is no longer in table */ - assert (!hash_has_key(table, &key)); - - /* Free the table */ - hash_destroy(table); - - return 0; -} diff --git a/common/dhash/examples/dhash_test.c b/common/dhash/examples/dhash_test.c deleted file mode 100644 index e5b922dad..000000000 --- a/common/dhash/examples/dhash_test.c +++ /dev/null @@ -1,510 +0,0 @@ -/* - Authors: - John Dennis <jdennis.redhat.com> - - Copyright (C) 2009 Red Hat - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdio.h> -#include <assert.h> -#include <string.h> -#include <stdlib.h> -#include <time.h> -#include <getopt.h> -#include "dhash.h" - -#define DEFAULT_MAX_TEST (500) -hash_entry_t *iter_result_1 = NULL; -hash_entry_t *iter_result_2 = NULL; - -unsigned long max_test = DEFAULT_MAX_TEST; -int verbose = 0; - -const char *error_string(int error) -{ - if (IS_HASH_ERROR(error)) - return hash_error_string(error); - - return strerror(error); -} - -char *key_string(hash_key_t *key) -{ - static char buf[1024]; - - switch(key->type) { - case HASH_KEY_ULONG: - snprintf(buf, sizeof(buf), "key ulong = %lu", key->ul); - break; - case HASH_KEY_STRING: - snprintf(buf, sizeof(buf), "key string = \"%s\"", key->str); - break; - default: - snprintf(buf, sizeof(buf), "unknown key type = %d", key->type); - break; - } - return buf; -} - -char *value_string(hash_value_t *value) -{ - static char buf[1024]; - - switch(value->type) { - case HASH_VALUE_UNDEF: - snprintf(buf, sizeof(buf), "value undefined"); - break; - case HASH_VALUE_PTR: - snprintf(buf, sizeof(buf), "value str = \"%s\"", (char *)value->ptr); - break; - case HASH_VALUE_INT: - snprintf(buf, sizeof(buf), "value int = %d", value->i); - break; - case HASH_VALUE_UINT: - snprintf(buf, sizeof(buf), "value unsigned int = %u", value->ui); - break; - case HASH_VALUE_LONG: - snprintf(buf, sizeof(buf), "value long = %ld", value->l); - break; - case HASH_VALUE_ULONG: - snprintf(buf, sizeof(buf), "value unsigned long = %lu", value->ul); - break; - case HASH_VALUE_FLOAT: - snprintf(buf, sizeof(buf), "value float = %f", value->f); - break; - case HASH_VALUE_DOUBLE: - snprintf(buf, sizeof(buf), "value double = %f", value->f); - break; - default: - snprintf(buf, sizeof(buf), "unknown value type = %d", value->type); - break; - } - - return buf; -} - -char *entry_string(hash_entry_t *entry) -{ - static char buf[1024]; - - snprintf(buf, sizeof(buf), "[%s] = [%s]", key_string(&entry->key), value_string(&entry->value)); - - return buf; - -} - -bool callback(hash_entry_t *item, void *user_data) -{ - unsigned long *callback_count = (unsigned long *)user_data; - - iter_result_1[*callback_count] = *item; - - (*callback_count)++; - - if (verbose) printf("%s\n", entry_string(item)); - return true; -} - -void delete_callback(hash_entry_t *item, hash_destroy_enum type, void *pvt) -{ - if (item->value.type == HASH_VALUE_PTR) free(item->value.ptr); -} - -typedef struct test_val_t { - long val; - char *str; -} test_val_t; - - -int main(int argc, char **argv) -{ - test_val_t *test = NULL; - long i, k; - int status; - hash_value_t value; - hash_key_t key; - char buf[1024]; - hash_table_t *table = NULL; - unsigned long callback_count = 0; - unsigned int directory_bits = HASH_DEFAULT_DIRECTORY_BITS; - unsigned int segment_bits = HASH_DEFAULT_SEGMENT_BITS; - unsigned long min_load_factor = HASH_DEFAULT_MIN_LOAD_FACTOR; - unsigned long max_load_factor = HASH_DEFAULT_MAX_LOAD_FACTOR; - - while (1) { - int arg; - int option_index = 0; - static struct option long_options[] = { - {"count", 1, 0, 'c'}, - {"verbose", 1, 0, 'v'}, - {"quiet", 1, 0, 'q'}, - {"directory-bits", 1, 0, 'd'}, - {"segment-bits", 1, 0, 's'}, - {"min-load-factor", 1, 0, 'l'}, - {"max-load-factor", 1, 0, 'h'}, - {0, 0, 0, 0} - }; - - arg = getopt_long(argc, argv, "c:vqd:s:l:h:", - long_options, &option_index); - if (arg == -1) break; - - switch (arg) { - case 'c': - max_test = atol(optarg); - break; - case 'v': - verbose = 1; - break; - case 'q': - verbose = 0; - break; - case 'd': - directory_bits = atoi(optarg); - break; - case 's': - segment_bits = atoi(optarg); - break; - case 'l': - min_load_factor = atol(optarg); - break; - case 'h': - max_load_factor = atol(optarg); - break; - } - } - - if ((test = (test_val_t *) calloc(max_test, sizeof(test_val_t))) == NULL) { - fprintf(stderr, "Failed to allocate test array\n"); - exit(1); - } - if ((iter_result_1 = (hash_entry_t *) calloc(max_test, sizeof(hash_entry_t))) == NULL) { - fprintf(stderr, "Failed to allocate iter_result_1 array\n"); - exit(1); - } - if ((iter_result_2 = (hash_entry_t *) calloc(max_test, sizeof(hash_entry_t))) == NULL) { - fprintf(stderr, "Failed to allocate iter_result_2 array\n"); - exit(1); - } - - - /* Initialize the random number generator */ - srandom(time(0)); - - /* Create the hash table as small as possible to exercise growth */ - if ((status = hash_create_ex(1, &table, - directory_bits, segment_bits, - min_load_factor, max_load_factor, - NULL, NULL, NULL, - delete_callback, NULL)) != HASH_SUCCESS) { - fprintf(stderr, "table creation failed at line %d (%s)\n", __LINE__, error_string(status)); - exit(1); - } - - /* Initialize the array of test values */ - for (i = 0; i < max_test; i++) { - test[i].val = random(); - /* If the value is odd we'll use a string as the key, - * otherwise we'll use an unsigned long as the key */ - if (test[i].val & 1) { - key.type = HASH_KEY_STRING; - sprintf(buf, "%ld", test[i].val); - test[i].str = strdup(buf); - } - } - - /* Enter all the test values into the hash table */ - for (i = 0; i < max_test; i++) { - if (test[i].val & 1) { - key.type = HASH_KEY_STRING; - key.str = test[i].str; - value.type = HASH_VALUE_PTR; - value.ptr = (void *) strdup(test[i].str); - } - else { - key.type = HASH_KEY_ULONG; - key.ul = test[i].val; - value.type = HASH_VALUE_LONG; - value.l = test[i].val; - } - - if (hash_has_key(table, &key)) { - fprintf(stderr, "Error: %ld already in table when inserting, i = %lu, at line %d\n", - test[i].val, i, __LINE__); - exit(1); - } - if ((status = hash_enter(table, &key, &value)) != HASH_SUCCESS) { - fprintf(stderr, "Error: %ld failed insertion at line %d (%s) \n", - test[i].val, __LINE__, error_string(status)); - exit(1); - } - } - - /* Now visit each entry in the table using a callback iterator, - * store what we found in iter_result_1 for testing the iterator object later on */ - if (verbose) printf("callback iterate:\n"); - callback_count = 0; - if ((status = hash_iterate(table, callback, &callback_count)) != HASH_SUCCESS) { - fprintf(stderr, "hash_iterate failed at line %d (%s)\n", __LINE__, error_string(status)); - exit(1); - } - if (verbose) printf("hash_count=%ld, callback_count=%ld\n", hash_count(table), callback_count); - - if (hash_count(table) != callback_count) { - fprintf(stderr, "Error: hash_count(%ld) != callback_count(%ld) at line %d\n", - hash_count(table), callback_count, __LINE__); - exit(1); - } - - /* Now vist each entry in the table using an iterator object */ - { - struct hash_iter_context_t *iter; - unsigned long n_items; - hash_entry_t *entry; - - if (verbose) printf("iter iterate:\n"); - - n_items = 0; - iter = new_hash_iter_context(table); - - while ((entry = iter->next(iter)) != NULL) { - if (verbose) printf("%s\n", entry_string(entry)); - iter_result_2[n_items] = *entry; - n_items++; - } - if (verbose) printf("hash_count=%ld, n_items=%ld\n", hash_count(table), n_items); - - if (hash_count(table) != n_items) { - fprintf(stderr, "Error: hash_count(%ld) != n_items(%ld) at line %d\n", - hash_count(table), n_items, __LINE__); - exit(1); - } - free(iter); - } - - /* Both iterators should have visited each item in the same order, verify ... */ - for (i = 0; i < max_test; i++) { - if (memcmp(&iter_result_1[i], &iter_result_2[i], sizeof(iter_result_1[0])) != 0) { - fprintf(stderr, "Error: iter_result_1[%lu] != iter_result_2[%lu] at line %d\n", - i, i, __LINE__); - exit(1); - } - } - - /* Get an array of keys in the table, print them out */ - { - unsigned long count; - hash_key_t *keys; - - if (verbose) printf("\nhash_keys:\n"); - if ((status = hash_keys(table, &count, &keys)) != HASH_SUCCESS) { - fprintf(stderr, "hash_keys failed at line %d (%s)\n", - __LINE__, error_string(status)); - exit(1); - } - - if (hash_count(table) != count) { - fprintf(stderr, "Error: hash_count(%ld) != hash_keys() count(%ld) at line %d\n", - hash_count(table), count, __LINE__); - exit(1); - } - - for (i = 0; i < count; i++) { - if (verbose) printf("%s\n", key_string(&keys[i])); - } - free(keys); - } - - /* Get an array of values in the table, print them out */ - { - unsigned long count; - hash_value_t *values; - - if (verbose) printf("\nhash_values:\n"); - hash_values(table, &count, &values); - - if (hash_count(table) != count) { - fprintf(stderr, "Error: hash_count(%ld) != hash_values() count(%ld) at line %d\n", - hash_count(table), count, __LINE__); - exit(1); - } - - for (i = 0; i < count; i++) { - if (verbose) printf("%s\n", value_string(&values[i])); - } - free(values); - } - - /* Get an array of items in the table, print them out */ - { - unsigned long count; - hash_entry_t *entries; - - if (verbose) printf("\nhash_entries:\n"); - hash_entries(table, &count, &entries); - - if (hash_count(table) != count) { - fprintf(stderr, "Error: hash_count(%ld) != hash_entries() count(%ld) at line %d\n", - hash_count(table), count, __LINE__); - exit(1); - } - - for (i = 0; i < count; i++) { - if (verbose) printf("%s\n", entry_string(&entries[i])); - } - free(entries); - } - - /* See if we can find every key */ - for (i = max_test - 1; i >= 0; i--) { - if (test[i].val & 1) { - key.type = HASH_KEY_STRING; - key.str = test[i].str; - } - else { - key.type = HASH_KEY_ULONG; - key.ul = test[i].val; - } - if ((status = hash_lookup(table, &key, &value)) != HASH_SUCCESS) { - fprintf(stderr, "Error: failed first lookup for value %ld at index %ld at line %d (%s)\n", - test[i].val, i, __LINE__, error_string(status)); - exit(1); - } - else { - switch(value.type) { - case HASH_VALUE_PTR: - if (strcmp((char *)value.ptr, test[i].str) != 0) { - fprintf(stderr, "Error: corrupt ptr data for %lu at line %d\n", i, __LINE__); - exit(1); - } - break; - case HASH_VALUE_LONG: - if (value.l != test[i].val) { - fprintf(stderr, "Error: corrupt long data for %lu at line %d\n", i, __LINE__); - exit(1); - } - break; - default: - fprintf(stderr, "Error: unknown value type for %lu\n", i); - break; - } - } - } - - - /* - * Delete a key, make sure we can't find it, assure we can find all other - * keys. - */ - for (i = 0; i < max_test; i++) { - if (test[i].val & 1) { - key.type = HASH_KEY_STRING; - key.str = test[i].str; - } - else { - key.type = HASH_KEY_ULONG; - key.ul = test[i].val; - } - - if ((status = hash_lookup(table, &key, &value)) != HASH_SUCCESS) { - fprintf(stderr, "Error: failed delete lookup for value %ld at index %ld at line %d (%s)\n", - test[i].val, i, __LINE__, error_string(status)); - exit(1); - } - - if ((status = hash_delete(table, &key)) != HASH_SUCCESS) { - fprintf(stderr, "Error: %ld not in table when deleting, i = %lu at line %d (%s)\n", - test[i].val, i, __LINE__, error_string(status)); - exit(1); - } - - if (hash_lookup(table, &key, &value) != HASH_ERROR_KEY_NOT_FOUND) { - fprintf(stderr, "Error: found in table after deletion, value = %ld at index %ld at line %d\n", - test[i].val, i, __LINE__); - exit(1); - } - /* See if we can find all remaining keys */ - for (k = i + 1; k < max_test; k++) { - if (test[k].val & 1) { - key.type = HASH_KEY_STRING; - key.str = test[k].str; - } else { - key.type = HASH_KEY_ULONG; - key.ul = test[k].val; - } - if ((status = hash_lookup(table, &key, &value)) != HASH_SUCCESS) { - fprintf(stderr, "Error: failed second lookup for value %ld, i = %lu k = %lu at line %d (%s)\n", - test[k].val, i, k, __LINE__, error_string(status)); - exit(1); - } else { - switch(value.type) { - case HASH_VALUE_PTR: - if (strcmp((char *)value.ptr, test[k].str) != 0) { - fprintf(stderr, "Error: corrupt ptr data for %lu at line %d\n", k, __LINE__); - exit(1); - } - break; - case HASH_VALUE_LONG: - if (value.l != test[k].val) { - fprintf(stderr, "Error: corrupt long data for %lu at line %d\n", k, __LINE__); - exit(1); - } - break; - default: - fprintf(stderr, "Error: unknown value type (%d) for %lu\n", value.type, k); - break; - } - } - } - } - - if (verbose) printf("\n"); - -#ifdef HASH_STATISTICS - { - hash_statistics_t stats; - - if ((status = hash_get_statistics(table, &stats)) != HASH_SUCCESS) { - fprintf(stderr, "Error: could not get statistics at line %d (%s)\n", - __LINE__, error_string(status)); - exit(1); - } - - printf("Statistics: Accesses = %ld, Collisions = %ld, Collision Rate = %.2f, Expansions = %ld, Contractions = %ld\n", - stats.hash_accesses, stats.hash_collisions, - ((float)stats.hash_collisions / (float)stats.hash_accesses), - stats.table_expansions, stats.table_contractions); - } -#endif - - if ((status = hash_destroy(table)) != HASH_SUCCESS) { - fprintf(stderr, "table destruction failed at line %d (%s)\n", - __LINE__, error_string(status)); - exit(1); - } - - for (i = 0; i < max_test; i++) { - if (test[i].val & 1) { - free(test[i].str); - } - } - free(test); - free(iter_result_1); - free(iter_result_2); - - printf("Successfully tested %lu values\n", max_test); - return 0; -} diff --git a/common/dhash/m4/.dir b/common/dhash/m4/.dir deleted file mode 100644 index e69de29bb..000000000 --- a/common/dhash/m4/.dir +++ /dev/null |