[gentoo-commits] gentoo-alt r1646 - in trunk/toolchain-prefix-wrapper: . ld utils

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-03-21 14:55:33 +0000 (Sat, 21 Mar 2009)
New Revision: 1646

Modified:
   trunk/toolchain-prefix-wrapper/configure.ac
   trunk/toolchain-prefix-wrapper/ld/ldwrapper.c
   trunk/toolchain-prefix-wrapper/utils/stringutil.c
Log:
inline some small funcs

Modified: trunk/toolchain-prefix-wrapper/configure.ac
===================================================================
--- trunk/toolchain-prefix-wrapper/configure.ac	2009-03-21 14:40:41 UTC (rev 1645)
+++ trunk/toolchain-prefix-wrapper/configure.ac	2009-03-21 14:55:33 UTC (rev 1646)
@@ -18,6 +18,8 @@
 
 AC_DEFINE_UNQUOTED([CHOST], ["${ac_cv_host}"], [host the wrapper is running on])
 
+AC_C_INLINE
+
 AC_MSG_CHECKING([for gentoo portage eprefix])
 AC_ARG_WITH([gentoo-portage-eprefix],
 	[AC_HELP_STRING(

Modified: trunk/toolchain-prefix-wrapper/ld/ldwrapper.c
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/ldwrapper.c	2009-03-21 14:40:41 UTC (rev 1645)
+++ trunk/toolchain-prefix-wrapper/ld/ldwrapper.c	2009-03-21 14:55:33 UTC (rev 1646)
@@ -53,7 +53,7 @@
 	LdPluginIn pluginIn;
 } LdWrapperData;
 
-static void wrapper_exit(char *msg, ...)
+static inline void wrapper_exit(char *msg, ...)
 {
 	va_list args;
 	fprintf(stderr, "binutils-config error: ");
@@ -66,7 +66,7 @@
 /* create the string "/${CTARGET}/binutils-bin/",
  * as this is used a few times.
  */
-static void setup_ctarget_binutilsbin(LdWrapperData *data)
+static inline void setup_ctarget_binutilsbin(LdWrapperData *data)
 {
 	if (data->_ctarget_binutilsbin_ == NULL) {
 		/* cache the string "/${CTARGET}/binutils-bin/" */
@@ -86,7 +86,7 @@
 /* check_for_binutils checks in path for the file we are seeking
  * it returns 1 if found (with data->bin setup), 0 if not
  */
-static int check_for_binutils(String const * path, LdWrapperData *data)
+static inline int check_for_binutils(String const * path, LdWrapperData *data)
 {
 	struct stat sbuf;
 	int result;
@@ -140,7 +140,7 @@
 	return 0;
 }
 
-static int find_binutils_in_path(LdWrapperData *data)
+static inline int find_binutils_in_path(LdWrapperData *data)
 {
 	int i, pathcount;
 
@@ -170,7 +170,7 @@
  * returns NULL if line does not set expected variable.
  * returns String containing the value for expected variable.
  */
-static String* parseline_shellvariable(LdWrapperData* data,
+static inline String* parseline_shellvariable(LdWrapperData* data,
 		char const *variable, int varlen, char const *line, int linelen)
 {
 	String* rv;
@@ -225,7 +225,7 @@
  * current BVER, then tries to parse /etc/env.d/binutils/${CTARGET}-${BVER}
  * to extract PATH, which is set to the current binutils' bin directory ...
  */
-static int find_binutils_in_envd(LdWrapperData *data)
+static inline int find_binutils_in_envd(LdWrapperData *data)
 {
 	Textfile* envfile = NULL;
 	String const * thisline;
@@ -303,7 +303,7 @@
 	return rv;
 }
 
-static void find_wrapper_binutils(LdWrapperData *data)
+static inline void find_wrapper_binutils(LdWrapperData *data)
 {
 	FILE *inpipe = NULL;
 	String* binpath_command;
@@ -362,7 +362,7 @@
 	pclose(inpipe);
 }
 
-static int filterSysLibpath(LdPluginData* pluginData)
+static inline int filterSysLibpath(LdPluginData* pluginData)
 {
 	int argc;
 	String const *argString;
@@ -423,7 +423,7 @@
 	TestLibpath
 } AddLibpathType;
 
-static int add_libpath(LdWrapperData* data, StringList* list, AddLibpathType type,
+static inline int add_libpath(LdWrapperData* data, StringList* list, AddLibpathType type,
 		char const *diagnostics,
 		char const *path, int len,
 		...)
@@ -477,7 +477,7 @@
  * This needs to be done when whe do
  * cross-prefix or cross-triplet.
  */
-static void add_target_toolchain_runpath(LdWrapperData* data)
+static inline void add_target_toolchain_runpath(LdWrapperData* data)
 {
 	if (data->pluginIn.isCrossTriplet
 	 || data->pluginIn.isCrossEprefix
@@ -503,7 +503,7 @@
 	}
 }
 
-static void add_target_toolchain_libpath(LdWrapperData* data)
+static inline void add_target_toolchain_libpath(LdWrapperData* data)
 {
 }
 
@@ -511,11 +511,11 @@
  * This needs to be done when we do
  * cross-triplet only.
  */
-static void add_cross_toolchain_runpath(LdWrapperData* data)
+static inline void add_cross_toolchain_runpath(LdWrapperData* data)
 {
 }
 
-static void add_cross_toolchain_libpath(LdWrapperData* data)
+static inline void add_cross_toolchain_libpath(LdWrapperData* data)
 {
 	if (data->pluginIn.isCrossTriplet) {
 		add_libpath(data, data->pluginIn.sysLibpath, AddLibpath,
@@ -555,7 +555,7 @@
  * to run even if there are dependencies missing in target eprefix,
  * as during bootstrap.
  */
-static void add_host_toolchain_runpath(LdWrapperData* data)
+static inline void add_host_toolchain_runpath(LdWrapperData* data)
 {
 	if (data->pluginIn.isCrossTriplet) {
 		return;
@@ -585,7 +585,7 @@
 	}
 }
 
-static void add_host_toolchain_libpath(LdWrapperData* data)
+static inline void add_host_toolchain_libpath(LdWrapperData* data)
 {
 	if (data->pluginIn.isCrossTriplet) {
 		return;
@@ -620,7 +620,7 @@
  * This only needs to be done if we do
  * cross-eprefix or use ROOT.
  */
-static void add_target_system(LdWrapperData* data)
+static inline void add_target_system(LdWrapperData* data)
 {
 	struct libdir {
 		char const *path; int len;
@@ -676,7 +676,7 @@
  *    because it is likely that the created binaries are executed from the
  *    new prefix, while still can use dependent libs from the old prefix.
  */
-static void add_host_system(LdWrapperData* data)
+static inline void add_host_system(LdWrapperData* data)
 {
 	struct libdir {
 		char const *path; int len;
@@ -716,7 +716,7 @@
 	}
 }
 
-static void callPlugin(LdWrapperData* data, LdPluginFct plugins)
+static inline void callPlugin(LdWrapperData* data, LdPluginFct plugins)
 {
 	LdPluginData pluginData = {0};
 	LdPluginOut pluginOut = {0};
@@ -753,7 +753,7 @@
 	LdPluginFct plugin;
 } KnownPlugin;
 
-static int compareKnownPluginName(void const *v1, void const *v2)
+static inline int compareKnownPluginName(void const *v1, void const *v2)
 {
 	KnownPlugin const* p1 = (KnownPlugin const*)v1;
 	KnownPlugin const* p2 = (KnownPlugin const*)v2;
@@ -764,7 +764,7 @@
 }
 
 /* call the plugins from comma-separated list of plugin-names */
-static void callPlugins(LdWrapperData* data, char const* plugins)
+static inline void callPlugins(LdWrapperData* data, char const* plugins)
 {
 	char const *end;
 	static KnownPlugin const knownPlugins[] = {

Modified: trunk/toolchain-prefix-wrapper/utils/stringutil.c
===================================================================
--- trunk/toolchain-prefix-wrapper/utils/stringutil.c	2009-03-21 14:40:41 UTC (rev 1645)
+++ trunk/toolchain-prefix-wrapper/utils/stringutil.c	2009-03-21 14:55:33 UTC (rev 1646)
@@ -16,7 +16,7 @@
 	char *buffer;
 } Content;
 
-static Content* ContentDestroy(Content* content)
+static inline Content* ContentDestroy(Content* content)
 {
 	if (content == NULL) {
 		return NULL;
@@ -31,7 +31,7 @@
 	return NULL;
 }
 
-static Content* ContentUnref(Content* content)
+static inline Content* ContentUnref(Content* content)
 {
 	if (content == NULL) {
 		return NULL;
@@ -43,7 +43,7 @@
 	return ContentDestroy(content);
 }
 
-static Content* ContentRef(Content* content)
+static inline Content* ContentRef(Content* content)
 {
 	if (content != NULL) {
 		++ content->referenceCount;
@@ -51,7 +51,7 @@
 	return content;
 }
 
-static Content* ContentCreate(int reserve)
+static inline Content* ContentCreate(int reserve)
 {
 	Content* content = (Content*)malloc(sizeof(Content));
 	if (content == NULL) {
@@ -72,7 +72,7 @@
 	return content;
 }
 
-static int ContentAppend(Content* content, char const *text, int length)
+static inline int ContentAppend(Content* content, char const *text, int length)
 {
 	if (content == NULL) return -1;
 	if (text == NULL) return 0;
@@ -85,7 +85,7 @@
 	return 0;
 }
 
-static Content* ContentCreateVaConcat(Content *orig, char const *text, int length, va_list ap)
+static inline Content* ContentCreateVaConcat(Content *orig, char const *text, int length, va_list ap)
 {
 	Content* content = NULL;
 	int concatLength;
@@ -157,7 +157,7 @@
 	return content;
 }
 
-static char * ContentExtractBuffer(Content* content)
+static inline char * ContentExtractBuffer(Content* content)
 {
 	char *ret = NULL;
 	if (content == NULL) {
@@ -169,7 +169,7 @@
 	return ret;
 }
 
-static int ContentGetLength(Content const * content)
+static inline int ContentGetLength(Content const * content)
 {
 	if (content == NULL) {
 		return -1;
@@ -177,7 +177,7 @@
 	return content->length;
 }
 
-static char const* ContentGetBuffer(Content const * content)
+static inline char const* ContentGetBuffer(Content const * content)
 {
 	if (content == NULL) {
 		return NULL;