From: Lukas Sandström Date: Sun, 13 Jul 2008 18:28:24 +0000 (+0200) Subject: Make some strbuf_*() struct strbuf arguments const. X-Git-Tag: v1.6.0-rc0~37^2~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b200fd68c799868c5c1383ef3eb34de7027f467;p=git.git Make some strbuf_*() struct strbuf arguments const. Signed-off-by: Lukas Sandström Signed-off-by: Junio C Hamano --- diff --git a/strbuf.c b/strbuf.c index 4aed75265..7767170db 100644 --- a/strbuf.c +++ b/strbuf.c @@ -67,7 +67,7 @@ void strbuf_rtrim(struct strbuf *sb) sb->buf[sb->len] = '\0'; } -int strbuf_cmp(struct strbuf *a, struct strbuf *b) +int strbuf_cmp(const struct strbuf *a, const struct strbuf *b) { int cmp; if (a->len < b->len) { diff --git a/strbuf.h b/strbuf.h index faec2291d..a1b01430e 100644 --- a/strbuf.h +++ b/strbuf.h @@ -61,7 +61,7 @@ static inline void strbuf_swap(struct strbuf *a, struct strbuf *b) { } /*----- strbuf size related -----*/ -static inline size_t strbuf_avail(struct strbuf *sb) { +static inline size_t strbuf_avail(const struct strbuf *sb) { return sb->alloc ? sb->alloc - sb->len - 1 : 0; } @@ -78,7 +78,7 @@ static inline void strbuf_setlen(struct strbuf *sb, size_t len) { /*----- content related -----*/ extern void strbuf_rtrim(struct strbuf *); -extern int strbuf_cmp(struct strbuf *, struct strbuf *); +extern int strbuf_cmp(const struct strbuf *, const struct strbuf *); /*----- add data in your buffer -----*/ static inline void strbuf_addch(struct strbuf *sb, int c) { @@ -98,7 +98,7 @@ extern void strbuf_add(struct strbuf *, const void *, size_t); static inline void strbuf_addstr(struct strbuf *sb, const char *s) { strbuf_add(sb, s, strlen(s)); } -static inline void strbuf_addbuf(struct strbuf *sb, struct strbuf *sb2) { +static inline void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) { strbuf_add(sb, sb2->buf, sb2->len); } extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len);