1 |
commit: 6b5210240228f6bbc67b3e32af1d840a8e66b645 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 29 02:16:54 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 02:16:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=6b521024 |
7 |
|
8 |
qmerge: pass struct by ref instead of value |
9 |
|
10 |
Avoids having to create a copy of a large struct whenever we make a call. |
11 |
|
12 |
qmerge.c | 8 ++++---- |
13 |
1 file changed, 4 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/qmerge.c b/qmerge.c |
16 |
index 2c92599..05e46b4 100644 |
17 |
--- a/qmerge.c |
18 |
+++ b/qmerge.c |
19 |
@@ -287,7 +287,7 @@ config_protected(const char *buf, int cp_argc, char **cp_argv, |
20 |
} |
21 |
|
22 |
static void |
23 |
-crossmount_rm(const char *fname, const struct stat st) |
24 |
+crossmount_rm(const char *fname, const struct stat * const st) |
25 |
{ |
26 |
struct stat lst; |
27 |
|
28 |
@@ -295,7 +295,7 @@ crossmount_rm(const char *fname, const struct stat st) |
29 |
|
30 |
if (lstat(fname, &lst) == -1) |
31 |
return; |
32 |
- if (lst.st_dev != st.st_dev) { |
33 |
+ if (lst.st_dev != st->st_dev) { |
34 |
warn("skipping crossmount install masking: %s", fname); |
35 |
return; |
36 |
} |
37 |
@@ -304,7 +304,7 @@ crossmount_rm(const char *fname, const struct stat st) |
38 |
} |
39 |
|
40 |
static void |
41 |
-install_mask_pwd(int iargc, char **iargv, const struct stat st) |
42 |
+install_mask_pwd(int iargc, char **iargv, const struct stat * const st) |
43 |
{ |
44 |
char buf[1024]; |
45 |
int i; |
46 |
@@ -931,7 +931,7 @@ pkg_merge(int level, const depend_atom *atom, const struct pkg_t *pkg) |
47 |
makeargv(install_mask, &iargc, &iargv); |
48 |
/* XXX: Would be better if INSTALL_MASK deleted from image/ |
49 |
* so we didn't have to parse it while doing merge_tree() */ |
50 |
- install_mask_pwd(iargc, iargv, st); |
51 |
+ install_mask_pwd(iargc, iargv, &st); |
52 |
|
53 |
if (strstr(features, "noinfo")) rm_rf("./usr/share/info"); |
54 |
if (strstr(features, "noman" )) rm_rf("./usr/share/man"); |