rugged 1.4.4 → 1.5.0

data/vendor/libgit2/src/{net.c → util/net.c}

@@ -6,7 +6,6 @@
  */
 
 #include "net.h"
-#include "netops.h"
 
 #include <ctype.h>
 

data/vendor/libgit2/src/{net.h → util/net.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_net_h__
 #define INCLUDE_net_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 typedef struct git_net_url {
 	char *scheme;

data/vendor/libgit2/src/{pool.h → util/pool.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_pool_h__
 #define INCLUDE_pool_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "vector.h"
 

data/vendor/libgit2/src/{posix.h → util/posix.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_posix_h__
 #define INCLUDE_posix_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include <stdlib.h>
 #include <fcntl.h>

data/vendor/libgit2/src/{pqueue.h → util/pqueue.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_pqueue_h__
 #define INCLUDE_pqueue_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "vector.h"
 

data/vendor/libgit2/src/{rand.c → util/rand.c}

@@ -6,7 +6,7 @@ worldwide. This software is distributed without any warranty.
 
 See <http://creativecommons.org/publicdomain/zero/1.0/>. */
 
-#include "common.h"
+#include "git2_util.h"
 #include "rand.h"
 #include "runtime.h"
 
@@ -106,8 +106,6 @@ GIT_INLINE(int) getseed(uint64_t *seed)
 		return -1;
 	}
 
-	getloadavg(loadavg, 3);
-
 	*seed = 0;
 	*seed |= ((uint64_t)tv.tv_usec << 40);
 	*seed |= ((uint64_t)tv.tv_sec);
@@ -119,9 +117,15 @@ GIT_INLINE(int) getseed(uint64_t *seed)
 	*seed ^= ((uint64_t)getuid() << 8);
 	*seed ^= ((uint64_t)getgid());
 
+# if defined(GIT_RAND_GETLOADAVG)
+	getloadavg(loadavg, 3);
+
 	convert.f = loadavg[0]; *seed ^= (convert.d >> 36);
 	convert.f = loadavg[1]; *seed ^= (convert.d);
 	convert.f = loadavg[2]; *seed ^= (convert.d >> 16);
+# else
+	GIT_UNUSED(loadavg[0]);
+# endif
 
 	convert.f = git__timer(); *seed ^= (convert.d);
 

data/vendor/libgit2/src/{rand.h → util/rand.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_rand_h__
 #define INCLUDE_rand_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 /**
  * Initialize the random number generation subsystem.  This will

data/vendor/libgit2/src/{regexp.h → util/regexp.h}

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_regexp_h__
 #define INCLUDE_regexp_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #if defined(GIT_REGEX_BUILTIN) || defined(GIT_REGEX_PCRE)
 # include "pcre.h"

data/vendor/libgit2/src/{runtime.c → util/runtime.c}

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 #include "runtime.h"
 
 static git_runtime_shutdown_fn shutdown_callback[32];

data/vendor/libgit2/src/{runtime.h → util/runtime.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_runtime_h__
 #define INCLUDE_runtime_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 typedef int (*git_runtime_init_fn)(void);
 typedef void (*git_runtime_shutdown_fn)(void);

data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_sorted_cache_h__
 #define INCLUDE_sorted_cache_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "util.h"
 #include "futils.h"

data/vendor/libgit2/src/{str.h → util/str.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_str_h__
 #define INCLUDE_str_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 struct git_str {
 	char *ptr;

data/vendor/libgit2/src/{strmap.h → util/strmap.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_strmap_h__
 #define INCLUDE_strmap_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 /** A map with C strings as key. */
 typedef struct kh_str_s git_strmap;

data/vendor/libgit2/src/{thread.c → util/thread.c}

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 
 #if !defined(GIT_THREADS)
 

data/vendor/libgit2/src/{tsort.c → util/tsort.c}

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 
 /**
  * An array-of-pointers implementation of Python's Timsort

data/vendor/libgit2/src/{unix → util/unix}/map.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 
 #if !defined(GIT_WIN32) && !defined(NO_MMAP)
 

data/vendor/libgit2/src/{unix → util/unix}/posix.h

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_unix_posix_h__
 #define INCLUDE_unix_posix_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include <stdio.h>
 #include <dirent.h>

data/vendor/libgit2/src/{unix → util/unix}/realpath.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 
 #ifndef GIT_WIN32
 

data/vendor/libgit2/src/{utf8.c → util/utf8.c}

@@ -7,7 +7,7 @@
 
 #include "utf8.h"
 
-#include "common.h"
+#include "git2_util.h"
 
 /*
  * git_utf8_iterate is taken from the utf8proc project,

data/vendor/libgit2/src/{utf8.h → util/utf8.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_utf8_h__
 #define INCLUDE_utf8_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 /*
  * Iterate through an UTF-8 string, yielding one codepoint at a time.

data/vendor/libgit2/src/{util.c → util/util.c}

@@ -7,7 +7,7 @@
 
 #include "util.h"
 
-#include "common.h"
+#include "git2_util.h"
 
 #ifdef GIT_WIN32
 # include "win32/utf-conv.h"

data/vendor/libgit2/src/{util.h → util/util.h}

@@ -12,7 +12,7 @@
 #endif
 
 #include "str.h"
-#include "common.h"
+#include "git2_util.h"
 #include "strnlen.h"
 #include "thread.h"
 

data/vendor/libgit2/src/{varint.h → util/varint.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_varint_h__
 #define INCLUDE_varint_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include <stdint.h>
 

data/vendor/libgit2/src/{vector.h → util/vector.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_vector_h__
 #define INCLUDE_vector_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 typedef int (*git_vector_cmp)(const void *, const void *);
 

data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h}

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_wildmatch_h__
 #define INCLUDE_wildmatch_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #define WM_CASEFOLD 1
 #define WM_PATHNAME 2

data/vendor/libgit2/src/{win32 → util/win32}/dir.h

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_win32_dir_h__
 #define INCLUDE_win32_dir_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "w32_util.h"
 

data/vendor/libgit2/src/{win32 → util/win32}/error.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_win32_error_h__
 #define INCLUDE_win32_error_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 extern char *git_win32_get_error_message(DWORD error_code);
 

data/vendor/libgit2/src/{win32 → util/win32}/findfile.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_win32_findfile_h__
 #define INCLUDE_win32_findfile_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 /** Sets the mock registry root for Git for Windows for testing. */
 extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir);

data/vendor/libgit2/src/{win32 → util/win32}/map.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "map.h"
 #include <errno.h>

data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_win32_path_w32_h__
 #define INCLUDE_win32_path_w32_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 /**
  * Create a Win32 path (in UCS-2 format) from a UTF-8 string.  If the given

data/vendor/libgit2/src/{win32 → util/win32}/posix.h

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_win32_posix_h__
 #define INCLUDE_win32_posix_h__
 
-#include "common.h"
+#include "git2_util.h"
 #include "../posix.h"
 #include "win32-compat.h"
 #include "path_w32.h"

data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "../posix.h"
 #include "../futils.h"

data/vendor/libgit2/src/util/win32/precompiled.c

@@ -0,0 +1 @@
+#include "precompiled.h"

data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include "git2_util.h"
 
 #include <errno.h>
 #include <limits.h>

data/vendor/libgit2/src/{win32 → util/win32}/thread.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_win32_thread_h__
 #define INCLUDE_win32_thread_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #if defined (_MSC_VER)
 #	define GIT_RESTRICT __restrict

data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.h

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_win32_utf_conv_h__
 #define INCLUDE_win32_utf_conv_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include <wchar.h>
 

data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_win32_w32_buffer_h__
 #define INCLUDE_win32_w32_buffer_h__
 
-#include "common.h"
+#include "git2_util.h"
 #include "str.h"
 
 /**

data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_win32_leakcheck_h__
 #define INCLUDE_win32_leakcheck_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 /* Initialize the win32 leak checking system. */
 int git_win32_leakcheck_global_init(void);

data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_win32_w32_util_h__
 #define INCLUDE_win32_w32_util_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include "utf-conv.h"
 #include "posix.h"

data/vendor/libgit2/src/{zstream.h → util/zstream.h}

@@ -7,7 +7,7 @@
 #ifndef INCLUDE_zstream_h__
 #define INCLUDE_zstream_h__
 
-#include "common.h"
+#include "git2_util.h"
 
 #include <zlib.h>