summaryrefslogtreecommitdiffstats
path: root/libopkg
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-10-30 02:35:22 (EDT)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-10-30 02:35:22 (EDT)
commite5cfa6dc4794e0a5bca36cabcd12a877454478db (patch)
treef7e12b17c22674289e3890f4abea5264e1bb0c54 /libopkg
parentbb61b4e2022bea1f8728d18dac18239ed6931826 (diff)
The compiler almost certainly knows better.
git-svn-id: http://opkg.googlecode.com/svn/trunk@228 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg')
-rw-r--r--libopkg/opkg_conf.c2
-rw-r--r--libopkg/pkg_depends.c24
-rw-r--r--libopkg/pkg_hash.c6
3 files changed, 16 insertions, 16 deletions
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 472b319..1312c41 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -668,7 +668,7 @@ int opkg_conf_write_status_files(opkg_conf_t *conf)
pkg_dest_t *dest;
pkg_vec_t *all;
pkg_t *pkg;
- register int i;
+ int i;
int err;
FILE * status_file=NULL;
diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
index bbe7868..e5c50c9 100644
--- a/libopkg/pkg_depends.c
+++ b/libopkg/pkg_depends.c
@@ -56,7 +56,7 @@ int pkg_hash_fetch_unsatisfied_dependencies(opkg_conf_t *conf, pkg_t * pkg,
pkg_vec_t *unsatisfied, char *** unresolved)
{
pkg_t * satisfier_entry_pkg;
- register int i, j, k;
+ int i, j, k;
int count, found;
char ** the_lost;
abstract_pkg_t * ab_pkg;
@@ -280,7 +280,7 @@ pkg_vec_t * pkg_hash_fetch_conflicts(hash_table_t * hash, pkg_t * pkg)
compound_depend_t * conflicts;
depend_t ** possible_satisfiers;
depend_t * possible_satisfier;
- register int i, j, k;
+ int i, j, k;
int count;
abstract_pkg_t * ab_pkg;
pkg_t **pkg_scouts;
@@ -437,7 +437,7 @@ int pkg_dependence_satisfied(opkg_conf_t *conf, depend_t *depend)
static int is_pkg_in_pkg_vec(pkg_vec_t * vec, pkg_t * pkg)
{
- register int i;
+ int i;
pkg_t ** pkgs = vec->pkgs;
for(i = 0; i < vec->len; i++)
@@ -568,7 +568,7 @@ static char ** merge_unresolved(char ** oldstuff, char ** newstuff)
{
int oldlen = 0, newlen = 0;
char ** result;
- register int i, j;
+ int i, j;
if(!newstuff)
return oldstuff;
@@ -617,7 +617,7 @@ char ** add_unresolved_dep(pkg_t * pkg, char ** the_lost, int ref_ndx)
void printDepends(pkg_t * pkg)
{
- register int i, j;
+ int i, j;
compound_depend_t * depend;
int count;
@@ -643,7 +643,7 @@ void printDepends(pkg_t * pkg)
int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
{
- register int i, j;
+ int i, j;
/* every pkg provides itself */
abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
@@ -677,7 +677,7 @@ int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
/* Abhaya: added conflicts support */
int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
{
- register int i;
+ int i;
compound_depend_t * conflicts;
if (!pkg->conflicts_count)
@@ -699,7 +699,7 @@ int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
{
- register int i, j;
+ int i, j;
if (!pkg->replaces_count)
return 0;
@@ -733,7 +733,7 @@ int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
int buildDepends(hash_table_t * hash, pkg_t * pkg)
{
int count;
- register int i;
+ int i;
compound_depend_t * depends;
if(!(count = pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count))
@@ -839,7 +839,7 @@ void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg)
{
compound_depend_t * depends;
int count, othercount;
- register int i, j;
+ int i, j;
abstract_pkg_t * ab_depend;
abstract_pkg_t ** temp;
@@ -899,8 +899,8 @@ static int parseDepends(compound_depend_t *compound_depend,
{
char * pkg_name, buffer[2048];
int num_of_ors = 0;
- register int i;
- register char * src, * dest;
+ int i;
+ char * src, * dest;
depend_t ** possibilities;
/* first count the number of ored possibilities for satisfying dependency */
diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c
index d15d441..5b7e3dd 100644
--- a/libopkg/pkg_hash.c
+++ b/libopkg/pkg_hash.c
@@ -388,7 +388,7 @@ pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash,
const char * version)
{
pkg_vec_t * vec;
- register int i;
+ int i;
char *version_str = NULL;
if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name)))
@@ -414,7 +414,7 @@ pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash,
pkg_dest_t *dest)
{
pkg_vec_t * vec;
- register int i;
+ int i;
if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) {
return NULL;
@@ -431,7 +431,7 @@ pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash,
const char *pkg_name)
{
pkg_vec_t * vec;
- register int i;
+ int i;
if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))){
return NULL;