[Frugalware-git] pacman-g2: libpacman: Do not propaget inforeq into file readers, they do not use or need it.

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=5751fbd795a84263b4affedf83c939057c1de28a

commit 5751fbd795a84263b4affedf83c939057c1de28a
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sat Nov 9 16:58:09 2013 +0100

libpacman: Do not propaget inforeq into file readers, they do not use or need 
it.

diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c
index ac0078b..1263545 100644
--- a/lib/libpacman/db/localdb.c
+++ b/lib/libpacman/db/localdb.c
@@ -119,7 +119,7 @@ int _pacman_localdb_rewind(pmdb_t *db)
}

static
-int _pacman_localdb_file_reader(pmdb_t *db, pmpkg_t *info, unsigned int 
inforeq, unsigned int inforeq_masq, const char *file, int (*reader)(pmpkg_t *, 
unsigned int, FILE *))
+int _pacman_localdb_file_reader(pmdb_t *db, pmpkg_t *info, unsigned int 
inforeq, unsigned int inforeq_masq, const char *file, int (*reader)(pmpkg_t *, 
FILE *))
{
int ret = 0;

@@ -133,7 +133,7 @@ int _pacman_localdb_file_reader(pmdb_t *db, pmpkg_t *info, 
unsigned int inforeq,
_pacman_log(PM_LOG_WARNING, "%s (%s)", path, strerror(errno));
return -1;
}
-               if(reader(info, inforeq, fp) == -1)
+               if(reader(info, fp) == -1)
return -1;
fclose(fp);
}
diff --git a/lib/libpacman/db/localdb_files.c b/lib/libpacman/db/localdb_files.c
index 130654f..d7e3839 100644
--- a/lib/libpacman/db/localdb_files.c
+++ b/lib/libpacman/db/localdb_files.c
@@ -63,7 +63,7 @@ int _pacman_db_read_lines(pmlist_t **list, char *s, size_t 
size, FILE *fp)
return lines;
}

-int _pacman_localdb_desc_fread(pmpkg_t *info, unsigned int inforeq, FILE *fp)
+int _pacman_localdb_desc_fread(pmpkg_t *info, FILE *fp)
{
char line[512];
int sline = sizeof(line)-1;
@@ -184,7 +184,7 @@ error:
return -1;
}

-int _pacman_localdb_depends_fread(pmpkg_t *info, unsigned int inforeq, FILE 
*fp)
+int _pacman_localdb_depends_fread(pmpkg_t *info, FILE *fp)
{
char line[512];
int sline = sizeof(line)-1;
@@ -219,7 +219,7 @@ int _pacman_localdb_depends_fread(pmpkg_t *info, unsigned 
int inforeq, FILE *fp)
return 0;
}

-int _pacman_localdb_files_fread(pmpkg_t *info, unsigned int inforeq, FILE *fp)
+int _pacman_localdb_files_fread(pmpkg_t *info, FILE *fp)
{
char line[512];
int sline = sizeof(line)-1;
diff --git a/lib/libpacman/db/localdb_files.h b/lib/libpacman/db/localdb_files.h
index 8f993c9..d369aa0 100644
--- a/lib/libpacman/db/localdb_files.h
+++ b/lib/libpacman/db/localdb_files.h
@@ -27,9 +27,9 @@

#include "pacman.h"

-int _pacman_localdb_desc_fread(pmpkg_t *info, unsigned int inforeq, FILE *fp);
-int _pacman_localdb_depends_fread(pmpkg_t *info, unsigned int inforeq, FILE 
*fp);
-int _pacman_localdb_files_fread(pmpkg_t *info, unsigned int inforeq, FILE *fp);
+int _pacman_localdb_desc_fread(pmpkg_t *info, FILE *fp);
+int _pacman_localdb_depends_fread(pmpkg_t *info, FILE *fp);
+int _pacman_localdb_files_fread(pmpkg_t *info, FILE *fp);

#endif /* _PACMAN_LOCALDB_FILES_H */

diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c
index 34f4cdb..75060ac 100644
--- a/lib/libpacman/db/syncdb.c
+++ b/lib/libpacman/db/syncdb.c
@@ -121,7 +121,7 @@ int _pacman_syncdb_rewind(pmdb_t *db)
}

static
-int _pacman_syncdb_file_reader(pmdb_t *db, pmpkg_t *info, unsigned int 
inforeq, unsigned int inforeq_masq, int (*reader)(pmpkg_t *, unsigned int, FILE 
*))
+int _pacman_syncdb_file_reader(pmdb_t *db, pmpkg_t *info, unsigned int 
inforeq, unsigned int inforeq_masq, int (*reader)(pmpkg_t *, FILE *))
{
int ret = 0;

@@ -129,7 +129,7 @@ int _pacman_syncdb_file_reader(pmdb_t *db, pmpkg_t *info, 
unsigned int inforeq,
FILE *fp = _pacman_archive_read_fropen(db->handle);

ASSERT(fp != NULL, RET_ERR(PM_ERR_MEMORY, -1));
-               ret = reader(info, inforeq, fp);
+               ret = reader(info, fp);
fclose(fp);
}
return ret;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git