summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Woodward2005-05-10 04:55:25 +0000
committerJason Woodward2005-05-10 04:55:25 +0000
commit3d264526f2a27465afd180355f50137dafabe1c1 (patch)
treee996735561b65c166bfd1316ee386f648258a75d /src
parent00be7404a50a67ddaf5351e4518cb159a83e5b20 (diff)
downloadslapt-get-3d264526f2a27465afd180355f50137dafabe1c1.tar.gz
code formatting updates
Diffstat (limited to 'src')
-rw-r--r--src/action.h4
-rw-r--r--src/common.h8
-rw-r--r--src/configuration.h40
-rw-r--r--src/curl.h6
-rw-r--r--src/main.h4
-rw-r--r--src/package.h40
-rw-r--r--src/transaction.h24
7 files changed, 63 insertions, 63 deletions
diff --git a/src/action.h b/src/action.h
index baa02ec..1ce126e 100644
--- a/src/action.h
+++ b/src/action.h
@@ -17,8 +17,8 @@
*/
typedef struct {
- char **pkgs;
- unsigned int count;
+ char **pkgs;
+ unsigned int count;
} pkg_action_args_t;
pkg_action_args_t *init_pkg_action_args(int arg_count);
diff --git a/src/common.h b/src/common.h
index 1b53538..01e6d48 100644
--- a/src/common.h
+++ b/src/common.h
@@ -29,10 +29,10 @@ JFALSE = FALSE, JTRUE = TRUE
} BOOL_T;
typedef struct {
- regex_t regex;
- size_t nmatch;
- regmatch_t pmatch[MAX_REGEX_PARTS];
- int reg_return;
+ regex_t regex;
+ size_t nmatch;
+ regmatch_t pmatch[MAX_REGEX_PARTS];
+ int reg_return;
} sg_regex;
FILE *open_file(const char *file_name,const char *mode);
diff --git a/src/configuration.h b/src/configuration.h
index dcb7d45..90b825f 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -22,32 +22,32 @@
#define EXCLUDE_TOKEN "EXCLUDE="
struct exclude_list {
- char **excludes;
- unsigned int count;
+ char **excludes;
+ unsigned int count;
};
struct source_list {
- char **url;
- unsigned int count;
+ char **url;
+ unsigned int count;
};
typedef struct {
- struct source_list *sources;
- char working_dir[WORKINGDIR_TOKEN_LEN];
- BOOL_T download_only;
- BOOL_T dist_upgrade;
- BOOL_T simulate;
- BOOL_T no_prompt;
- BOOL_T re_install;
- struct exclude_list *exclude_list;
- BOOL_T ignore_excludes;
- BOOL_T no_md5_check;
- BOOL_T ignore_dep;
- BOOL_T disable_dep_check;
- BOOL_T print_uris;
- BOOL_T dl_stats;
- BOOL_T remove_obsolete;
- int(*progress_cb)(void *,double,double,double,double);
+ struct source_list *sources;
+ char working_dir[WORKINGDIR_TOKEN_LEN];
+ BOOL_T download_only;
+ BOOL_T dist_upgrade;
+ BOOL_T simulate;
+ BOOL_T no_prompt;
+ BOOL_T re_install;
+ struct exclude_list *exclude_list;
+ BOOL_T ignore_excludes;
+ BOOL_T no_md5_check;
+ BOOL_T ignore_dep;
+ BOOL_T disable_dep_check;
+ BOOL_T print_uris;
+ BOOL_T dl_stats;
+ BOOL_T remove_obsolete;
+ int(*progress_cb)(void *,double,double,double,double);
} rc_config;
diff --git a/src/curl.h b/src/curl.h
index 972c91c..c470efa 100644
--- a/src/curl.h
+++ b/src/curl.h
@@ -17,8 +17,8 @@
*/
struct head_data_t {
- char *data;
- size_t size;
+ char *data;
+ size_t size;
};
/* this is the main download routine */
@@ -27,7 +27,7 @@ int download_data(FILE *fh,const char *url,size_t bytes,
char *head_request(const char *url);
/*
- this fills FILE with data from url, used for PACKAGES.TXT and CHECKSUMS
+ this fills FILE with data from url, used for PACKAGES.TXT and CHECKSUMS
*/
int get_mirror_data_from_source(FILE *fh,const rc_config *global_config,
const char *base_url,const char *filename);
diff --git a/src/main.h b/src/main.h
index eb7a385..07b351a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -44,8 +44,8 @@
#include "action.h"
enum action {
- USAGE = 0, UPDATE, INSTALL, REMOVE, SHOW, SEARCH, UPGRADE,
- LIST, INSTALLED, CLEAN, SHOWVERSION, AUTOCLEAN, AVAILABLE
+ USAGE = 0, UPDATE, INSTALL, REMOVE, SHOW, SEARCH, UPGRADE,
+ LIST, INSTALLED, CLEAN, SHOWVERSION, AUTOCLEAN, AVAILABLE
};
#define UPDATE_OPT 'u'
diff --git a/src/package.h b/src/package.h
index 0271941..39a9e6a 100644
--- a/src/package.h
+++ b/src/package.h
@@ -45,38 +45,38 @@
#define HEAD_FILE_EXT ".head"
typedef struct {
- char *name;
- char *version;
- char *mirror;
- char *location;
- unsigned int size_c;
- unsigned int size_u;
- char *description;
- char *required;
- char *conflicts;
- char *suggests;
- char md5[MD5_STR_LEN];
+ char *name;
+ char *version;
+ char *mirror;
+ char *location;
+ unsigned int size_c;
+ unsigned int size_u;
+ char *description;
+ char *required;
+ char *conflicts;
+ char *suggests;
+ char md5[MD5_STR_LEN];
} pkg_info_t;
struct pkg_list {
- pkg_info_t **pkgs;
- unsigned int pkg_count;
- BOOL_T free_pkgs;
+ pkg_info_t **pkgs;
+ unsigned int pkg_count;
+ BOOL_T free_pkgs;
};
typedef struct {
- pkg_info_t *installed;
- pkg_info_t *upgrade;
+ pkg_info_t *installed;
+ pkg_info_t *upgrade;
} pkg_upgrade_t;
struct pkg_upgrade_list {
- pkg_upgrade_t **pkgs;
- unsigned int pkg_count;
+ pkg_upgrade_t **pkgs;
+ unsigned int pkg_count;
};
struct pkg_version_parts {
- char **parts;
- unsigned int count;
+ char **parts;
+ unsigned int count;
};
diff --git a/src/transaction.h b/src/transaction.h
index b34bb4e..c856297 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -19,27 +19,27 @@
#define MAX_LINE_LEN 80
struct suggests {
- char **pkgs;
- unsigned int count;
+ char **pkgs;
+ unsigned int count;
};
typedef struct {
- union { pkg_info_t *i; pkg_upgrade_t *u; } pkg;
- unsigned int type;
+ union { pkg_info_t *i; pkg_upgrade_t *u; } pkg;
+ unsigned int type;
} queue_i;
typedef struct {
- queue_i **pkgs;
- unsigned int count;
+ queue_i **pkgs;
+ unsigned int count;
} queue_t;
typedef struct {
- struct pkg_list *install_pkgs;
- struct pkg_upgrade_list *upgrade_pkgs;
- struct pkg_list *remove_pkgs;
- struct pkg_list *exclude_pkgs;
- struct suggests *suggests;
- queue_t *queue;
+ struct pkg_list *install_pkgs;
+ struct pkg_upgrade_list *upgrade_pkgs;
+ struct pkg_list *remove_pkgs;
+ struct pkg_list *exclude_pkgs;
+ struct suggests *suggests;
+ queue_t *queue;
} transaction_t;
void init_transaction(transaction_t *);