summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-23 18:53:23 -0400
committermidipix <writeonce@midipix.org>2016-04-23 22:06:41 -0400
commitf058a6b12fb33c7ce5ecf4a644040979f0e32ef7 (patch)
tree4775e36f1ef0c0ca3919a8d9ddf2a96d08b13ab5 /src
parentdaae2d3a4014d5d18c1939bae1e9349ff15f72ae (diff)
downloadslibtool-f058a6b12fb33c7ce5ecf4a644040979f0e32ef7.tar.bz2
slibtool-f058a6b12fb33c7ce5ecf4a644040979f0e32ef7.tar.xz
slbt_archive_import(): fix header inclusion and variable naming.
Diffstat (limited to 'src')
-rw-r--r--src/helper/slbt_archive_import.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/helper/slbt_archive_import.c b/src/helper/slbt_archive_import.c
index b3842f8..e742b6a 100644
--- a/src/helper/slbt_archive_import.c
+++ b/src/helper/slbt_archive_import.c
@@ -4,7 +4,7 @@
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
-#include <stdlib.h>
+#include <stdio.h>
#include <limits.h>
#include <unistd.h>
#include <string.h>
@@ -71,9 +71,9 @@ int slbt_archive_import(
char * dstarchive,
char * srcarchive)
{
- pid_t pid;
int ret;
- int code;
+ pid_t pid;
+ pid_t rpid;
int fd[2];
FILE * fout;
char * dst;
@@ -124,7 +124,7 @@ int slbt_archive_import(
close(fd[1]);
}
- code = waitpid(
+ rpid = waitpid(
pid,
&ectx->exitcode,
0);
@@ -135,6 +135,6 @@ int slbt_archive_import(
if (src == mrisrc)
unlink(src);
- return ret || (code != pid) || ectx->exitcode
+ return ret || (rpid != pid) || ectx->exitcode
? -1 : 0;
}