moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

Various small fixes as suggested by some static code checkers

Browse Source 
I ran flawfinder and sparse over the pacman source code and found a few
things that were worth fixing (and were quick fixes).

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-07-06 12:11:55 -04:00
parent 6b7b974318
commit 15e1ce2e70
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libalpm/add.c
View File

@ -23,13 +23,6 @@
* USA. * USA.
*/ */
#if defined(__APPLE__) || defined(__OpenBSD__)
#include <sys/syslimits.h>
#endif
#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__)
#include <sys/stat.h>
#endif
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>

4
lib/libalpm/alpm.c
View File

@ -44,7 +44,7 @@ enum _pmerrno_t pm_errno SYMEXPORT;
* functions are called. * functions are called.
* @return 0 on success, -1 on error (pm_errno is set accordingly) * @return 0 on success, -1 on error (pm_errno is set accordingly)
*/ */
int SYMEXPORT alpm_initialize() int SYMEXPORT alpm_initialize(void)
{ {
ASSERT(handle == NULL, RET_ERR(PM_ERR_HANDLE_NOT_NULL, -1)); ASSERT(handle == NULL, RET_ERR(PM_ERR_HANDLE_NOT_NULL, -1));
@ -59,7 +59,7 @@ int SYMEXPORT alpm_initialize()
/** Release the library. This should be the last alpm call you make. /** Release the library. This should be the last alpm call you make.
* @return 0 on success, -1 on error (pm_errno is set accordingly) * @return 0 on success, -1 on error (pm_errno is set accordingly)
*/ */
int SYMEXPORT alpm_release() int SYMEXPORT alpm_release(void)
{ {
int dbs_left = 0; int dbs_left = 0;

2
lib/libalpm/alpm.h
View File

@ -56,7 +56,7 @@ typedef struct __pmgraph_t pmgraph_t;
* Library * Library
*/ */
int alpm_initialize(); int alpm_initialize(void);
int alpm_release(void); int alpm_release(void);
/* /*

8
lib/libalpm/util.c
View File

@ -85,7 +85,7 @@ char *mkdtemp(char *template)
/* Save template */ /* Save template */
(void) strcpy(t, template); (void) strcpy(t, template);
for (; ; ) { for (; ; ) {
r = mktemp(template); r = mkstemp(template);
if (*r == '\0') if (*r == '\0')
return (NULL); return (NULL);
@ -156,21 +156,21 @@ int _alpm_copyfile(const char *src, const char *dest)
while((len = fread(buf, 1, 4096, in))) { while((len = fread(buf, 1, 4096, in))) {
fwrite(buf, 1, len, out); fwrite(buf, 1, len, out);
} }
fclose(in); fclose(in);
fclose(out);
/* chmod dest to permissions of src, as long as it is not a symlink */ /* chmod dest to permissions of src, as long as it is not a symlink */
struct stat statbuf; struct stat statbuf;
if(!stat(src, &statbuf)) { if(!stat(src, &statbuf)) {
if(! S_ISLNK(statbuf.st_mode)) { if(! S_ISLNK(statbuf.st_mode)) {
chmod(dest, statbuf.st_mode); fchmod(fileno(out), statbuf.st_mode);
} }
} else { } else {
/* stat was unsuccessful */ /* stat was unsuccessful */
fclose(out);
return(1); return(1);
} }
fclose(out);
return(0); return(0);
} }