geoip2_c 0.3.4 → 0.4.1

data/ext/geoip2/libmaxminddb/projects/VS12-tests/threads.vcxproj

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8E11E9FC-7B63-11E4-AE98-6B41E8A9DDB2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>threads</RootNamespace>
-    <ProjectName>test_threads</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;$(SolutionDir)\..\..\t\libtap</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\t\threads_t.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libtap.vcxproj">
-      <Project>{4dfc985a-83d7-4e61-85fe-c6ea6e43e3aa}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VS12\libmaxminddb.vcxproj">
-      <Project>{82953bda-2960-4ada-a6d5-92e65ccb4a3d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="maxminddb_test_helper.vcxproj">
-      <Project>{a8f568f6-5507-4ec2-a834-f2c0a3c635a5}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

data/ext/geoip2/libmaxminddb/projects/VS12-tests/version.vcxproj

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B19851FA-376C-11E7-A95B-48C58C130AD6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>version</RootNamespace>
-    <ProjectName>test_version</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;$(SolutionDir)\..\..\t\libtap</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\t\version_t.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libtap.vcxproj">
-      <Project>{4dfc985a-83d7-4e61-85fe-c6ea6e43e3aa}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VS12\libmaxminddb.vcxproj">
-      <Project>{82953bda-2960-4ada-a6d5-92e65ccb4a3d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="maxminddb_test_helper.vcxproj">
-      <Project>{a8f568f6-5507-4ec2-a834-f2c0a3c635a5}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

data/ext/geoip2/libmaxminddb/projects/test.vcxproj.template

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{%UUID%}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>%TESTNAME%</RootNamespace>
-    <ProjectName>test_%TESTNAME%</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;$(SolutionDir)\..\..\t\libtap</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\t\%TESTNAME%_t.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libtap.vcxproj">
-      <Project>{4dfc985a-83d7-4e61-85fe-c6ea6e43e3aa}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VS12\libmaxminddb.vcxproj">
-      <Project>{82953bda-2960-4ada-a6d5-92e65ccb4a3d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="maxminddb_test_helper.vcxproj">
-      <Project>{a8f568f6-5507-4ec2-a834-f2c0a3c635a5}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

data/ext/geoip2/libmaxminddb/src/Makefile.am

@@ -1,25 +0,0 @@
-include $(top_srcdir)/common.mk
-
-lib_LTLIBRARIES = libmaxminddb.la
-
-libmaxminddb_la_SOURCES = maxminddb.c maxminddb-compat-util.h \
-	data-pool.c data-pool.h
-libmaxminddb_la_LDFLAGS = -version-info 0:7:0 -export-symbols-regex '^MMDB_.*'
-include_HEADERS = $(top_srcdir)/include/maxminddb.h
-
-pkgconfig_DATA = libmaxminddb.pc
-
-TESTS = test-data-pool
-
-check_PROGRAMS = test-data-pool
-
-test_data_pool_SOURCES = data-pool.c data-pool.h
-test_data_pool_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/t -DTEST_DATA_POOL
-test_data_pool_LDADD = $(top_srcdir)/t/libmmdbtest.la \
-	$(top_srcdir)/t/libtap/libtap.a
-
-$(top_srcdir)/t/libmmdbtest.la:
-	$(MAKE) -C $(top_srcdir)/t libmmdbtest.la
-
-$(top_srcdir)/t/libtap/libtap.a:
-	$(MAKE) -C $(top_srcdir)/t/libtap libtap.a

data/ext/geoip2/libmaxminddb/src/data-pool.c

@@ -1,180 +0,0 @@
-#include "data-pool.h"
-#include "maxminddb.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-static bool can_multiply(size_t const, size_t const, size_t const);
-
-// Allocate an MMDB_data_pool_s. It initially has space for size
-// MMDB_entry_data_list_s structs.
-MMDB_data_pool_s *data_pool_new(size_t const size)
-{
-    MMDB_data_pool_s *const pool = calloc(1, sizeof(MMDB_data_pool_s));
-    if (!pool) {
-        return NULL;
-    }
-
-    if (size == 0 ||
-        !can_multiply(SIZE_MAX, size, sizeof(MMDB_entry_data_list_s))) {
-        data_pool_destroy(pool);
-        return NULL;
-    }
-    pool->size = size;
-    pool->blocks[0] = calloc(pool->size, sizeof(MMDB_entry_data_list_s));
-    if (!pool->blocks[0]) {
-        data_pool_destroy(pool);
-        return NULL;
-    }
-    pool->blocks[0]->pool = pool;
-
-    pool->sizes[0] = size;
-
-    pool->block = pool->blocks[0];
-
-    return pool;
-}
-
-// Determine if we can multiply m*n. We can do this if the result will be below
-// the given max. max will typically be SIZE_MAX.
-//
-// We want to know if we'll wrap around.
-static bool can_multiply(size_t const max, size_t const m, size_t const n)
-{
-    if (m == 0) {
-        return false;
-    }
-
-    return n <= max / m;
-}
-
-// Clean up the data pool.
-void data_pool_destroy(MMDB_data_pool_s *const pool)
-{
-    if (!pool) {
-        return;
-    }
-
-    for (size_t i = 0; i <= pool->index; i++) {
-        free(pool->blocks[i]);
-    }
-
-    free(pool);
-}
-
-// Claim a new struct from the pool. Doing this may cause the pool's size to
-// grow.
-MMDB_entry_data_list_s *data_pool_alloc(MMDB_data_pool_s *const pool)
-{
-    if (!pool) {
-        return NULL;
-    }
-
-    if (pool->used < pool->size) {
-        MMDB_entry_data_list_s *const element = pool->block + pool->used;
-        pool->used++;
-        return element;
-    }
-
-    // Take it from a new block of memory.
-
-    size_t const new_index = pool->index + 1;
-    if (new_index == DATA_POOL_NUM_BLOCKS) {
-        // See the comment about not growing this on DATA_POOL_NUM_BLOCKS.
-        return NULL;
-    }
-
-    if (!can_multiply(SIZE_MAX, pool->size, 2)) {
-        return NULL;
-    }
-    size_t const new_size = pool->size * 2;
-
-    if (!can_multiply(SIZE_MAX, new_size, sizeof(MMDB_entry_data_list_s))) {
-        return NULL;
-    }
-    pool->blocks[new_index] = calloc(new_size, sizeof(MMDB_entry_data_list_s));
-    if (!pool->blocks[new_index]) {
-        return NULL;
-    }
-
-    // We don't need to set this, but it's useful for introspection in tests.
-    pool->blocks[new_index]->pool = pool;
-
-    pool->index = new_index;
-    pool->block = pool->blocks[pool->index];
-
-    pool->size = new_size;
-    pool->sizes[pool->index] = pool->size;
-
-    MMDB_entry_data_list_s *const element = pool->block;
-    pool->used = 1;
-    return element;
-}
-
-// Turn the structs in the array-like pool into a linked list.
-//
-// Before calling this function, the list isn't linked up.
-MMDB_entry_data_list_s *data_pool_to_list(MMDB_data_pool_s *const pool)
-{
-    if (!pool) {
-        return NULL;
-    }
-
-    if (pool->index == 0 && pool->used == 0) {
-        return NULL;
-    }
-
-    for (size_t i = 0; i <= pool->index; i++) {
-        MMDB_entry_data_list_s *const block = pool->blocks[i];
-
-        size_t size = pool->sizes[i];
-        if (i == pool->index) {
-            size = pool->used;
-        }
-
-        for (size_t j = 0; j < size - 1; j++) {
-            MMDB_entry_data_list_s *const cur = block + j;
-            cur->next = block + j + 1;
-        }
-
-        if (i < pool->index) {
-            MMDB_entry_data_list_s *const last = block + size - 1;
-            last->next = pool->blocks[i + 1];
-        }
-    }
-
-    return pool->blocks[0];
-}
-
-#ifdef TEST_DATA_POOL
-
-#include <libtap/tap.h>
-#include <maxminddb_test_helper.h>
-
-static void test_can_multiply(void);
-
-int main(void)
-{
-    plan(NO_PLAN);
-    test_can_multiply();
-    done_testing();
-}
-
-static void test_can_multiply(void)
-{
-    {
-        ok(can_multiply(SIZE_MAX, 1, SIZE_MAX), "1*SIZE_MAX is ok");
-    }
-
-    {
-        ok(!can_multiply(SIZE_MAX, 2, SIZE_MAX), "2*SIZE_MAX is not ok");
-    }
-
-    {
-        ok(can_multiply(SIZE_MAX, 10240, sizeof(MMDB_entry_data_list_s)),
-           "1024 entry_data_list_s's are okay");
-    }
-}
-
-#endif

data/ext/geoip2/libmaxminddb/src/data-pool.h

@@ -1,52 +0,0 @@
-#ifndef DATA_POOL_H
-#define DATA_POOL_H
-
-#include "maxminddb.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-
-// This should be large enough that we never need to grow the array of pointers
-// to blocks. 32 is enough. Even starting out of with size 1 (1 struct), the
-// 32nd element alone will provide 2**32 structs as we exponentially increase
-// the number in each block. Being confident that we do not have to grow the
-// array lets us avoid writing code to do that. That code would be risky as it
-// would rarely be hit and likely not be well tested.
-#define DATA_POOL_NUM_BLOCKS 32
-
-// A pool of memory for MMDB_entry_data_list_s structs. This is so we can
-// allocate multiple up front rather than one at a time for performance
-// reasons.
-//
-// The order you add elements to it (by calling data_pool_alloc()) ends up as
-// the order of the list.
-//
-// The memory only grows. There is no support for releasing an element you take
-// back to the pool.
-typedef struct MMDB_data_pool_s {
-    // Index of the current block we're allocating out of.
-    size_t index;
-
-    // The size of the current block, counting by structs.
-    size_t size;
-
-    // How many used in the current block, counting by structs.
-    size_t used;
-
-    // The current block we're allocating out of.
-    MMDB_entry_data_list_s *block;
-
-    // The size of each block.
-    size_t sizes[DATA_POOL_NUM_BLOCKS];
-
-    // An array of pointers to blocks of memory holding space for list
-    // elements.
-    MMDB_entry_data_list_s *blocks[DATA_POOL_NUM_BLOCKS];
-} MMDB_data_pool_s;
-
-MMDB_data_pool_s *data_pool_new(size_t const);
-void data_pool_destroy(MMDB_data_pool_s *const);
-MMDB_entry_data_list_s *data_pool_alloc(MMDB_data_pool_s *const);
-MMDB_entry_data_list_s *data_pool_to_list(MMDB_data_pool_s *const);
-
-#endif

data/ext/geoip2/libmaxminddb/src/libmaxminddb.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libmaxminddb
-Description: C library for the MaxMind DB file format
-URL: http://maxmind.github.io/libmaxminddb/
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lmaxminddb
-Cflags: -I${includedir}