[syslinux:elflink] com32: We only need one refstr.h
syslinux-bot for Matt Fleming
matt.fleming at linux.intel.com
Wed Apr 27 14:30:57 PDT 2011
Commit-ID: 8c192a160451afed805546973f8ab46050d09723
Gitweb: http://syslinux.zytor.com/commit/8c192a160451afed805546973f8ab46050d09723
Author: Matt Fleming <matt.fleming at linux.intel.com>
AuthorDate: Thu, 14 Apr 2011 00:50:08 +0100
Committer: Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Tue, 26 Apr 2011 09:54:02 +0100
com32: We only need one refstr.h
Delete the duplicate refstr.h and move the remaining copy into
com32/include so that it can be included by both ldlinux and the menu
code.
Signed-off-by: Matt Fleming <matt.fleming at linux.intel.com>
---
com32/{elflink/ldlinux => include}/refstr.h | 0
com32/menu/refstr.h | 40 ---------------------------
2 files changed, 0 insertions(+), 40 deletions(-)
diff --git a/com32/elflink/ldlinux/refstr.h b/com32/include/refstr.h
similarity index 100%
rename from com32/elflink/ldlinux/refstr.h
rename to com32/include/refstr.h
diff --git a/com32/menu/refstr.h b/com32/menu/refstr.h
deleted file mode 100644
index 7001d40..0000000
--- a/com32/menu/refstr.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ----------------------------------------------------------------------- *
- *
- * Copyright 2008 H. Peter Anvin - All Rights Reserved
- *
- * 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, Inc., 51 Franklin St, Fifth Floor,
- * Boston MA 02110-1301, USA; either version 2 of the License, or
- * (at your option) any later version; incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * refstr.h
- *
- * Simple reference-counted strings
- */
-
-#ifndef REFSTR_H
-#define REFSTR_H
-
-#include <stddef.h>
-#include <stdarg.h>
-
-static inline __attribute__ ((always_inline))
-const char *refstr_get(const char *r)
-{
- if (r)
- ((unsigned int *)r)[-1]++;
- return r;
-}
-
-void refstr_put(const char *);
-char *refstr_alloc(size_t);
-const char *refstrdup(const char *);
-const char *refstrndup(const char *, size_t);
-int rsprintf(const char **, const char *, ...);
-int vrsprintf(const char **, const char *, va_list);
-
-#endif
More information about the Syslinux-commits
mailing list