diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2008-08-17 21:26:49 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-08-20 01:43:46 +0200 |
| commit | 729651a55473f6e64c4dc95888efbe2e4c76efa0 (patch) | |
| tree | cf0e256b09ceee95a999154092d0e8416b8cea7d | |
| parent | 232b838a54e689800267e1b98ace207bd442b8cd (diff) | |
| download | pacman-729651a55473f6e64c4dc95888efbe2e4c76efa0.tar.gz pacman-729651a55473f6e64c4dc95888efbe2e4c76efa0.tar.xz | |
Remove an usused variable from alpm/util.c/_alpm_lckmk()
Probably a tweakable "lockdb-retry" option was planned which is not
implemented. (Now it should be implemented in front-end.)
So now this variable was unused and caused a small memleak.
(FREE(dir) was not reached in case of error.)
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/util.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2847db7b..b26c9702 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -241,7 +241,7 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) /* Create a lock file */ int _alpm_lckmk() { - int fd, count = 0; + int fd; char *dir, *ptr; const char *file = alpm_option_get_lockfile(); @@ -252,17 +252,9 @@ int _alpm_lckmk() *ptr = '\0'; } _alpm_makepath(dir); - - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { - if(++count < 1) { - sleep(1); - } else { - return(-1); - } - } - FREE(dir); + fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); return(fd > 0 ? fd : -1); } |