commit 38d42f420a1cb73c623fcda9776c1f679cb8dcb1
from: Stefan Sperling <stsp@stsp.name>
date: Mon Feb 12 21:57:02 2018 UTC

inline refs.h in refs.c

commit - 3b339b2ff82475321e7d732db7c0cd4b3cc185bf
commit + 38d42f420a1cb73c623fcda9776c1f679cb8dcb1
blob - ed7e78ee70bec40bb5900a344e5b1231f8247ac0
blob + 85fbf80742a3486fb1e896b8d26388cd22b2aff5
--- lib/refs.c
+++ lib/refs.c
@@ -34,8 +34,30 @@
 #include "delta.h"
 #include "zb.h"
 #include "object.h"
-#include "refs.h"
+
+/* A symbolic reference. */
+struct got_symref {
+	char *name;
+	char *ref;
+};
+
+/* A non-symbolic reference (there is no better designation). */
+struct got_ref {
+	char *name;
+	u_int8_t sha1[SHA1_DIGEST_LENGTH];
+};
 
+/* A reference which points to an arbitrary object. */
+struct got_reference {
+	unsigned int flags;
+#define GOT_REF_IS_SYMBOLIC	0x01
+
+	union {
+		struct got_ref ref;
+		struct got_symref symref;
+	} ref;
+};
+
 static const struct got_error *
 parse_symref(struct got_reference **ref, const char *name, const char *line)
 {
blob - ab502f71fa59c822e00b1b5f96be73b343f3d1c9 (mode 644)
blob + /dev/null
--- lib/refs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* A symbolic reference. */
-struct got_symref {
-	char *name;
-	char *ref;
-};
-
-/* A non-symbolic reference (there is no better designation). */
-struct got_ref {
-	char *name;
-	u_int8_t sha1[SHA1_DIGEST_LENGTH];
-};
-
-/* A reference which points to an arbitrary object. */
-struct got_reference {
-	unsigned int flags;
-#define GOT_REF_IS_SYMBOLIC	0x01
-
-	union {
-		struct got_ref ref;
-		struct got_symref symref;
-	} ref;
-};