List for cgit developers and users
 help / color / mirror / Atom feed
From: list at eworm.de (Christian Hesse)
Subject: [PATCH 4/8] ui-shared: return value of cgit_currenturl is not const
Date: Fri,  9 Oct 2015 13:15:47 +0200	[thread overview]
Message-ID: <1444389351-2154-4-git-send-email-list@eworm.de> (raw)
In-Reply-To: <1444389351-2154-1-git-send-email-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 ui-shared.c | 4 ++--
 ui-shared.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-shared.c b/ui-shared.c
index d9f8258..b739675 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -65,10 +65,10 @@ const char *cgit_hosturl(void)
 	return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
-const char *cgit_currenturl(void)
+char *cgit_currenturl(void)
 {
 	if (!ctx.qry.url)
-		return cgit_rooturl();
+		return xstrdup(cgit_rooturl());
 	const char *root = cgit_rooturl();
 	size_t len = strlen(root);
 	if (len && root[len - 1] == '/')
diff --git a/ui-shared.h b/ui-shared.h
index 246678b..4121416 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -4,7 +4,7 @@
 extern const char *cgit_httpscheme();
 extern const char *cgit_hosturl();
 extern const char *cgit_rooturl();
-extern const char *cgit_currenturl();
+extern char *cgit_currenturl();
 extern const char *cgit_loginurl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
-- 
2.6.1



  parent reply	other threads:[~2015-10-09 11:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-09 11:15 [PATCH 1/8] ui-tree: fix resource leak: free before return list
2015-10-09 11:15 ` [PATCH 2/8] ui-ssdiff: fix resource leak: free allocation from cgit_fileurl list
2015-10-09 11:59   ` Jason
2015-10-09 11:15 ` [PATCH 3/8] ui-shared: " list
2015-10-09 11:15 ` list [this message]
2015-10-09 12:01   ` [PATCH 4/8] ui-shared: return value of cgit_currenturl is not const Jason
2015-10-09 11:15 ` [PATCH 5/8] ui-shared: fix resource leak: free allocation from cgit_currenturl list
2015-10-09 12:02   ` Jason
2015-10-09 11:15 ` [PATCH 6/8] cmd: fix resource leak: free allocation from cgit_currenturl and fmtalloc list
2015-10-09 12:03   ` Jason
2015-10-09 12:08     ` list
2015-10-09 12:13       ` mailings
2015-10-09 12:16         ` list
2015-10-09 12:25           ` Jason
2015-10-09 11:15 ` [PATCH 7/8] ui-shared: return value of cgit_hosturl is not const list
2015-10-09 12:04   ` Jason
2015-10-09 11:15 ` [PATCH 8/8] ui-shared: fix resource leak: free allocation from cgit_hosturl list
2015-10-09 12:04   ` Jason
2015-10-09 12:13     ` list
2015-10-09 11:58 ` [PATCH 1/8] ui-tree: fix resource leak: free before return Jason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444389351-2154-4-git-send-email-list@eworm.de \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).