Punt the rc_strcatpaths function and use snprintf instead to save on expensive malloc calls.

2 files changed, 1 insertions, 46 deletions

diff --git a/man/Makefile b/man/Makefile
index f8c8dedb..0357d27a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,6 +1,6 @@
 MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
-		rc_runlevel.3 rc_service.3 rc_strcatpaths.3 rc_stringlist.3
+		rc_runlevel.3 rc_service.3 rc_stringlist.3
 MAN8=		rc-status.8 rc-update.8 rc.8 runscript.8 start-stop-daemon.8
 
 # Handy macro to create symlinks
diff --git a/man/rc_strcatpaths.3 b/man/rc_strcatpaths.3
deleted file mode 100644
index 118dbfa7..00000000
--- a/man/rc_strcatpaths.3
+++ /dev/null
@@ -1,45 +0,0 @@
-.\" Copyright 2007-2008 Roy Marples
-.\" All rights reserved
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd Feb 22, 2008
-.Dt RC_STRCATPATHS 3 SMM
-.Os OpenRC
-.Sh NAME
-.Nm rc_strcatpaths
-.Nd concatenates each elements, seperating each with / as necessary
-.Sh LIBRARY
-Run Command library (librc, -lrc)
-.Sh SYNOPSIS
-.In rc.h
-.Ft "char *" Fn rc_strcatpaths "const char *path" ...
-.Sh DESCRIPTION
-.Fn rc_strcatpaths concatenates each
-.Fa path ,
-seperating each with / as necessary and returns a malloced pointer
-to the result. This should be freed when done.
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3
-.Sh AUTHORS
-.An "Roy Marples" Aq roy@marples.name