Strbuf is a widely used basic structure that should only interact with
other primitives in strbuf.[ch]. Over time certain functions inside of
strbuf.[ch] have been added to interact with higher level objects and
functions. This series cleans up some of those higher level interactions
by moving the offending functions to the files they interact with and
adding documentation to strbuf.h. With the goal of eventually being able
to stand up strbuf as a libary, this series also removes the use of
environment variables from strbuf.
Calvin Wan (7):
strbuf: clarify API boundary
abspath: move related functions to abspath
credential-store: move related functions to credential-store file
object-name: move related functions to object-name
path: move related function to path
strbuf: clarify dependency
strbuf: remove environment variables
abspath.c | 36 +++++++++++++
abspath.h | 21 ++++++++
add-patch.c | 12 +++--
builtin/am.c | 2 +-
builtin/branch.c | 4 +-
builtin/commit.c | 2 +-
builtin/credential-store.c | 19 +++++++
builtin/merge.c | 10 ++--
builtin/notes.c | 16 +++---
builtin/rebase.c | 2 +-
builtin/stripspace.c | 6 ++-
builtin/tag.c | 9 ++--
fmt-merge-msg.c | 9 ++--
gpg-interface.c | 5 +-
hook.c | 1 +
object-name.c | 15 ++++++
object-name.h | 9 ++++
path.c | 20 +++++++
path.h | 5 ++
pretty.c | 1 +
rebase-interactive.c | 15 +++---
sequencer.c | 24 +++++----
strbuf.c | 106 +++----------------------------------
strbuf.h | 53 +++++--------------
tempfile.c | 1 +
wt-status.c | 6 +--
26 files changed, 220 insertions(+), 189 deletions(-)
Range-diff against v1:
-: ---------- > 1: e0dd3f5295 strbuf: clarify API boundary
1: 283771c088 ! 2: ec1ea6ae4f abspath: move related functions to abspath
@@ Commit message
abspath: move related functions to abspath
Move abspath-related functions from strbuf.[ch] to abspath.[ch] since
- they do not belong in a low-level library.
+ paths are not primitive objects and therefore strbuf should not interact
+ with them.
## abspath.c ##
@@ abspath.c: char *prefix_filename_except_for_dash(const char *pfx, const char *arg)
2: 58f78b8ae0 = 3: 2d74561b91 credential-store: move related functions to credential-store file
3: 88ab90c079 ! 4: 30b5e635cb object-name: move related functions to object-name
@@ Commit message
object-name: move related functions to object-name
Move object-name-related functions from strbuf.[ch] to object-name.[ch]
- since they do not belong in a low-level library.
+ since paths are not a primitive object that strbuf should directly
+ interact with.
## object-name.c ##
@@ object-name.c: static void find_abbrev_len_packed(struct min_abbrev_data *mad)
4: 30b7de5a81 ! 5: 6905618470 path: move related function to path
@@ Metadata
## Commit message ##
path: move related function to path
- Move path-related function from strbuf.[ch] to path.[ch] since it does
- not belong in a low-level library.
+ Move path-related function from strbuf.[ch] to path.[ch] since path is
+ not a primitive object and therefore strbuf should not directly interact
+ with it.
## path.c ##
@@ path.c: int normalize_path_copy(char *dst, const char *src)
5: 7b6d6353de ! 6: caf3482bf7 strbuf: clarify dependency
@@ Metadata
## Commit message ##
strbuf: clarify dependency
+ refs.h was once needed but is no longer so as of 6bab74e7fb8 ("strbuf:
+ move strbuf_branchname to sha1_name.c", 2010-11-06). strbuf.h was
+ included thru refs.h, so removing refs.h requires strbuf.h to be added
+ back.
+
## strbuf.c ##
@@
#include "environment.h"
6: ffacd1cbe5 ! 7: a7f23488f8 strbuf: remove enviroment variables
@@ Metadata
Author: Calvin Wan <calvinwan@xxxxxxxxxx>
## Commit message ##
- strbuf: remove enviroment variables
+ strbuf: remove environment variables
- As a lower level library, strbuf should not directly access environment
- variables within its functions. Therefore, add an additional variable to
- function signatures for functions that use an environment variable and
- refactor callers to pass in the environment variable.
+ As a library that only interacts with other primitives, strbuf should
+ not directly access environment variables within its
+ functions. Therefore, add an additional variable to function signatures
+ for functions that use an environment variable and refactor callers to
+ pass in the environment variable.
## add-patch.c ##
@@ add-patch.c: static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
@@ strbuf.h: void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
__attribute__((format (printf,2,0)))
void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
@@ strbuf.h: int strbuf_normalize_path(struct strbuf *sb);
+
+ /**
* Strip whitespace from a buffer. The second parameter controls if
- * comments are considered contents to be removed or not.
+- * comments are considered contents to be removed or not.
++ * comments are considered contents to be removed or not. The third parameter
++ * is the comment character that determines whether a line is a comment or not.
*/
-void strbuf_stripspace(struct strbuf *buf, int skip_comments);
+void strbuf_stripspace(struct strbuf *buf, int skip_comments, char comment_line_char);
--
2.40.1.521.gf1e218fcd8-goog
