[PATCH 1/3] ui-repolist: fix memory leak

[PATCH 1/3] ui-repolist: fix memory leak

[list]

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 ui-repolist.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui-repolist.c b/ui-repolist.c
index 1d9a7f7..7158bf7 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -343,13 +343,15 @@ void cgit_print_repolist(void)
 				html_txt(ctx.repo->owner);
 				cgit_close_filter(ctx.repo->owner_filter);
 			} else {
+				char *currenturl = cgit_currenturl();
 				html("<a href='");
-				html_attr(cgit_currenturl());
+				html_attr(currenturl);
 				html("?q=");
 				html_url_arg(ctx.repo->owner);
 				html("'>");
 				html_txt(ctx.repo->owner);
 				html("</a>");
+				free(currenturl);
 			}
 			html("</td><td>");
 		}
-- 
2.10.0

[PATCH 2/3] shared: remove unused function strrpart()

[list]

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 cgit.h   |  1 -
 shared.c | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/cgit.h b/cgit.h
index df42312..bef6e5f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -334,7 +334,6 @@ extern int chk_non_negative(int result, char *msg);
 extern char *trim_end(const char *str, char c);
 extern char *ensure_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
-extern char *strrpart(char *txt, int maxlen);
 
 extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
diff --git a/shared.c b/shared.c
index 571fbba..8d08435 100644
--- a/shared.c
+++ b/shared.c
@@ -158,21 +158,6 @@ char *strlpart(char *txt, int maxlen)
 	return result;
 }
 
-char *strrpart(char *txt, int maxlen)
-{
-	char *result;
-
-	if (!txt)
-		return txt;
-
-	if (strlen(txt) <= maxlen)
-		return txt;
-	result = xmalloc(maxlen + 1);
-	memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
-	result[0] = result[1] = result[2] = '.';
-	return result;
-}
-
 void cgit_add_ref(struct reflist *list, struct refinfo *ref)
 {
 	size_t size;
-- 
2.10.0

[PATCH 2/3] shared: remove unused function strrpart()

[Jason]

LGTM.

[PATCH 3/3] shared: remove unused function strlpart()

[list]

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 cgit.h   |  1 -
 shared.c | 16 ----------------
 2 files changed, 17 deletions(-)

diff --git a/cgit.h b/cgit.h
index bef6e5f..fbc6c6a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -333,7 +333,6 @@ extern int chk_non_negative(int result, char *msg);
 
 extern char *trim_end(const char *str, char c);
 extern char *ensure_end(const char *str, char c);
-extern char *strlpart(char *txt, int maxlen);
 
 extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
diff --git a/shared.c b/shared.c
index 8d08435..c63f1e3 100644
--- a/shared.c
+++ b/shared.c
@@ -142,22 +142,6 @@ void strbuf_ensure_end(struct strbuf *sb, char c)
 		strbuf_addch(sb, c);
 }
 
-char *strlpart(char *txt, int maxlen)
-{
-	char *result;
-
-	if (!txt)
-		return txt;
-
-	if (strlen(txt) <= maxlen)
-		return txt;
-	result = xmalloc(maxlen + 1);
-	memcpy(result, txt, maxlen - 3);
-	result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
-	result[maxlen] = '\0';
-	return result;
-}
-
 void cgit_add_ref(struct reflist *list, struct refinfo *ref)
 {
 	size_t size;
-- 
2.10.0

[PATCH 3/3] shared: remove unused function strlpart()

[Jason]

Also looks good.

[PATCH 1/3] ui-repolist: fix memory leak

[Jason]

Nice find, thanks. Queue 'er up.