Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
remove unnecessary initializations
Browse files Browse the repository at this point in the history
[jc: I needed to hand merge the changes to the updated codebase,
 so the result needs to be checked.]

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
rientjes authored and Junio C Hamano committed Aug 16, 2006
1 parent c9c3470 commit 96f1e58
Show file tree
Hide file tree
Showing 42 changed files with 163 additions and 163 deletions.
6 changes: 3 additions & 3 deletions blame.c
Expand Up @@ -56,9 +56,9 @@ struct patch {
static void get_blob(struct commit *commit);

/* Only used for statistics */
static int num_get_patch = 0;
static int num_commits = 0;
static int patch_time = 0;
static int num_get_patch;
static int num_commits;
static int patch_time;

struct blame_diff_state {
struct xdiff_emit_state xm;
Expand Down
28 changes: 14 additions & 14 deletions builtin-apply.c
Expand Up @@ -28,18 +28,18 @@ static int prefix_length = -1;
static int newfd = -1;

static int p_value = 1;
static int allow_binary_replacement = 0;
static int check_index = 0;
static int write_index = 0;
static int cached = 0;
static int diffstat = 0;
static int numstat = 0;
static int summary = 0;
static int check = 0;
static int allow_binary_replacement;
static int check_index;
static int write_index;
static int cached;
static int diffstat;
static int numstat;
static int summary;
static int check;
static int apply = 1;
static int apply_in_reverse = 0;
static int no_add = 0;
static int show_index_info = 0;
static int apply_in_reverse;
static int no_add;
static int show_index_info;
static int line_termination = '\n';
static unsigned long p_context = -1;
static const char apply_usage[] =
Expand All @@ -51,10 +51,10 @@ static enum whitespace_eol {
error_on_whitespace,
strip_whitespace,
} new_whitespace = warn_on_whitespace;
static int whitespace_error = 0;
static int whitespace_error;
static int squelch_whitespace_errors = 5;
static int applied_after_stripping = 0;
static const char *patch_input_file = NULL;
static int applied_after_stripping;
static const char *patch_input_file;

static void parse_whitespace_option(const char *option)
{
Expand Down
2 changes: 1 addition & 1 deletion builtin-fmt-merge-msg.c
Expand Up @@ -8,7 +8,7 @@
static const char *fmt_merge_msg_usage =
"git-fmt-merge-msg [--summary] [--no-summary] [--file <file>]";

static int merge_summary = 0;
static int merge_summary;

static int fmt_merge_msg_config(const char *key, const char *value)
{
Expand Down
27 changes: 14 additions & 13 deletions builtin-ls-files.c
Expand Up @@ -12,21 +12,22 @@
#include "dir.h"
#include "builtin.h"

static int abbrev = 0;
static int show_deleted = 0;
static int show_cached = 0;
static int show_others = 0;
static int show_stage = 0;
static int show_unmerged = 0;
static int show_modified = 0;
static int show_killed = 0;
static int show_valid_bit = 0;
static int abbrev;
static int show_deleted;
static int show_cached;
static int show_others;
static int show_stage;
static int show_unmerged;
static int show_modified;
static int show_killed;
static int show_valid_bit;
static int line_terminator = '\n';

static int prefix_len = 0, prefix_offset = 0;
static const char **pathspec = NULL;
static int error_unmatch = 0;
static char *ps_matched = NULL;
static int prefix_len;
static int prefix_offset;
static const char **pathspec;
static int error_unmatch;
static char *ps_matched;

static const char *tag_cached = "";
static const char *tag_unmerged = "";
Expand Down
6 changes: 3 additions & 3 deletions builtin-ls-tree.c
Expand Up @@ -14,10 +14,10 @@ static int line_termination = '\n';
#define LS_TREE_ONLY 2
#define LS_SHOW_TREES 4
#define LS_NAME_ONLY 8
static int abbrev = 0;
static int ls_options = 0;
static int abbrev;
static int ls_options;
static const char **pathspec;
static int chomp_prefix = 0;
static int chomp_prefix;
static const char *ls_tree_prefix;

static const char ls_tree_usage[] =
Expand Down
6 changes: 3 additions & 3 deletions builtin-mailinfo.c
Expand Up @@ -16,8 +16,8 @@

static FILE *cmitmsg, *patchfile, *fin, *fout;

static int keep_subject = 0;
static const char *metainfo_charset = NULL;
static int keep_subject;
static const char *metainfo_charset;
static char line[1000];
static char date[1000];
static char name[1000];
Expand All @@ -31,7 +31,7 @@ static char charset[256];

static char multipart_boundary[1000];
static int multipart_boundary_len;
static int patch_lines = 0;
static int patch_lines;

static char *sanity_check(char *name, char *email)
{
Expand Down
2 changes: 1 addition & 1 deletion builtin-name-rev.c
Expand Up @@ -75,7 +75,7 @@ static void name_rev(struct commit *commit,
}
}

static int tags_only = 0;
static int tags_only;

static int name_ref(const char *path, const unsigned char *sha1)
{
Expand Down
28 changes: 14 additions & 14 deletions builtin-pack-objects.c
Expand Up @@ -53,17 +53,17 @@ struct object_entry {
*/

static unsigned char object_list_sha1[20];
static int non_empty = 0;
static int no_reuse_delta = 0;
static int local = 0;
static int incremental = 0;
static int non_empty;
static int no_reuse_delta;
static int local;
static int incremental;
static struct object_entry **sorted_by_sha, **sorted_by_type;
static struct object_entry *objects = NULL;
static int nr_objects = 0, nr_alloc = 0, nr_result = 0;
static struct object_entry *objects;
static int nr_objects, nr_alloc, nr_result;
static const char *base_name;
static unsigned char pack_file_sha1[20];
static int progress = 1;
static volatile sig_atomic_t progress_update = 0;
static volatile sig_atomic_t progress_update;
static int window = 10;

/*
Expand All @@ -72,8 +72,8 @@ static int window = 10;
* sorted_by_sha is also possible but this was easier to code and faster.
* This hashtable is built after all the objects are seen.
*/
static int *object_ix = NULL;
static int object_ix_hashsz = 0;
static int *object_ix;
static int object_ix_hashsz;

/*
* Pack index for existing packs give us easy access to the offsets into
Expand All @@ -90,15 +90,15 @@ struct pack_revindex {
struct packed_git *p;
unsigned long *revindex;
} *pack_revindex = NULL;
static int pack_revindex_hashsz = 0;
static int pack_revindex_hashsz;

/*
* stats
*/
static int written = 0;
static int written_delta = 0;
static int reused = 0;
static int reused_delta = 0;
static int written;
static int written_delta;
static int reused;
static int reused_delta;

static int pack_revindex_ix(struct packed_git *p)
{
Expand Down
2 changes: 1 addition & 1 deletion builtin-prune.c
Expand Up @@ -11,7 +11,7 @@
#include "cache-tree.h"

static const char prune_usage[] = "git-prune [-n]";
static int show_only = 0;
static int show_only;
static struct rev_info revs;

static int prune_object(char *path, const char *filename, const unsigned char *sha1)
Expand Down
8 changes: 4 additions & 4 deletions builtin-push.c
Expand Up @@ -10,14 +10,14 @@

static const char push_usage[] = "git-push [--all] [--tags] [-f | --force] <repository> [<refspec>...]";

static int all = 0, tags = 0, force = 0, thin = 1;
static const char *execute = NULL;
static int all, tags, force, thin = 1;
static const char *execute;

#define BUF_SIZE (2084)
static char buffer[BUF_SIZE];

static const char **refspec = NULL;
static int refspec_nr = 0;
static const char **refspec;
static int refspec_nr;

static void add_refspec(const char *ref)
{
Expand Down
2 changes: 1 addition & 1 deletion builtin-read-tree.c
Expand Up @@ -12,7 +12,7 @@
#include "unpack-trees.h"
#include "builtin.h"

static struct object_list *trees = NULL;
static struct object_list *trees;

static int list_tree(unsigned char *sha1)
{
Expand Down
16 changes: 8 additions & 8 deletions builtin-repo-config.c
Expand Up @@ -5,14 +5,14 @@
static const char git_config_set_usage[] =
"git-repo-config [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --unset | --unset-all] name [value [value_regex]] | --list";

static char* key = NULL;
static regex_t* key_regexp = NULL;
static regex_t* regexp = NULL;
static int show_keys = 0;
static int use_key_regexp = 0;
static int do_all = 0;
static int do_not_match = 0;
static int seen = 0;
static char *key;
static regex_t *key_regexp;
static regex_t *regexp;
static int show_keys;
static int use_key_regexp;
static int do_all;
static int do_not_match;
static int seen;
static enum { T_RAW, T_INT, T_BOOL } type = T_RAW;

static int show_all_config(const char *key_, const char *value_)
Expand Down
6 changes: 3 additions & 3 deletions builtin-rev-list.c
Expand Up @@ -39,9 +39,9 @@ static const char rev_list_usage[] =

static struct rev_info revs;

static int bisect_list = 0;
static int show_timestamp = 0;
static int hdr_termination = 0;
static int bisect_list;
static int show_timestamp;
static int hdr_termination;
static const char *header_prefix;

static void show_commit(struct commit *commit)
Expand Down
10 changes: 5 additions & 5 deletions builtin-rev-parse.c
Expand Up @@ -15,16 +15,16 @@
#define DO_NONFLAGS 8
static int filter = ~0;

static const char *def = NULL;
static const char *def;

#define NORMAL 0
#define REVERSED 1
static int show_type = NORMAL;
static int symbolic = 0;
static int abbrev = 0;
static int output_sq = 0;
static int symbolic;
static int abbrev;
static int output_sq;

static int revs_count = 0;
static int revs_count;

/*
* Some arguments are relevant "revision" arguments,
Expand Down
6 changes: 3 additions & 3 deletions builtin-show-branch.c
Expand Up @@ -8,9 +8,9 @@
static const char show_branch_usage[] =
"git-show-branch [--sparse] [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]";

static int default_num = 0;
static int default_alloc = 0;
static const char **default_arg = NULL;
static int default_num;
static int default_alloc;
static const char **default_arg;

#define UNINTERESTING 01

Expand Down
2 changes: 1 addition & 1 deletion builtin-update-index.c
Expand Up @@ -23,7 +23,7 @@ static int allow_replace;
static int info_only;
static int force_remove;
static int verbose;
static int mark_valid_only = 0;
static int mark_valid_only;
#define MARK_VALID 1
#define UNMARK_VALID 2

Expand Down
6 changes: 3 additions & 3 deletions commit.c
Expand Up @@ -727,10 +727,10 @@ struct commit *pop_commit(struct commit_list **stack)

int count_parents(struct commit * commit)
{
int count = 0;
int count;
struct commit_list * parents = commit->parents;
for (count=0;parents; parents=parents->next,count++)
;
for (count = 0; parents; parents = parents->next,count++)
;
return count;
}

Expand Down
6 changes: 3 additions & 3 deletions connect.c
Expand Up @@ -10,7 +10,7 @@
#include <netdb.h>
#include <signal.h>

static char *server_capabilities = NULL;
static char *server_capabilities;

static int check_ref(const char *name, int len, unsigned int flags)
{
Expand Down Expand Up @@ -493,8 +493,8 @@ static void git_tcp_connect(int fd[2], char *host)
}


static char *git_proxy_command = NULL;
static const char *rhost_name = NULL;
static char *git_proxy_command;
static const char *rhost_name;
static int rhost_len;

static int git_proxy_command_options(const char *var, const char *value)
Expand Down

0 comments on commit 96f1e58

Please sign in to comment.