Commit 38d42f420a1cb73c623fcda9776c1f679cb8dcb1
2018-02-12T22:57:02
inline refs.h in refs.c
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/lib/refs.c b/lib/refs.c
index ed7e78e..85fbf80 100644
--- a/lib/refs.c
+++ b/lib/refs.c
@@ -34,7 +34,29 @@
#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)
diff --git a/lib/refs.h b/lib/refs.h
deleted file mode 100644
index ab502f7..0000000
--- a/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;
-};