Merge branch 'jc/make-static'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Sep 2012 21:37:46 +0000 (14:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Sep 2012 21:37:46 +0000 (14:37 -0700)
Turn many file-scope private symbols to static to reduce the
global namespace contamination.

* jc/make-static:
sequencer.c: mark a private file-scope symbol as static
ident.c: mark private file-scope symbols as static
trace.c: mark a private file-scope symbol as static
wt-status.c: mark a private file-scope symbol as static
read-cache.c: mark a private file-scope symbol as static
strbuf.c: mark a private file-scope symbol as static
sha1-array.c: mark a private file-scope symbol as static
symlinks.c: mark private file-scope symbols as static
notes.c: mark a private file-scope symbol as static
rerere.c: mark private file-scope symbols as static
graph.c: mark private file-scope symbols as static
diff.c: mark a private file-scope symbol as static
commit.c: mark a file-scope private symbol as static
builtin/notes.c: mark file-scope private symbols as static

1  2 
diff.c
sequencer.c
sequencer.h
diff --cc diff.c
Simple merge
diff --cc sequencer.c
index dbef5cea027f61a8172c4889005c090f1d0df048,ce8a59f576ac4950cd3abacd2f7a60086751de2a..e3723d20956719d2cba13ee6c6890ff1a8cfd21a
@@@ -17,9 -17,7 +17,9 @@@
  
  #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
  
- void remove_sequencer_state(void)
 +const char sign_off_header[] = "Signed-off-by: ";
 +
+ static void remove_sequencer_state(void)
  {
        struct strbuf seq_dir = STRBUF_INIT;
  
diff --cc sequencer.h
index 60287b8da2cddf635bc5ef13121e33e3cf25047c,99eb7fa09043094bdb6f1599c19716b9f578586c..9d57d57524d411c54d55346a5ecff67bc256595c
@@@ -44,13 -44,6 +44,10 @@@ struct replay_opts 
        struct rev_info *revs;
  };
  
- /* Removes SEQ_DIR. */
- extern void remove_sequencer_state(void);
  int sequencer_pick_revisions(struct replay_opts *opts);
  
 +extern const char sign_off_header[];
 +
 +void append_signoff(struct strbuf *msgbuf, int ignore_footer);
 +
  #endif