From: whydoubt at gmail.com (Jeff Smith)
Subject: [PATCH 2/5] ui-tree: move set_title_from_path to ui-shared
Date: Wed, 27 Sep 2017 17:43:28 -0500 [thread overview]
Message-ID: <20170927224331.26494-3-whydoubt@gmail.com> (raw)
In-Reply-To: <20170927224331.26494-1-whydoubt@gmail.com>
The ui-blame code will also need to call set_title_from_path, so go
ahead and move it to ui-shared.
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
ui-shared.c | 31 +++++++++++++++++++++++++++++++
ui-shared.h | 2 ++
ui-tree.c | 31 -------------------------------
3 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/ui-shared.c b/ui-shared.c
index e5c9a02..4ace20c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1111,3 +1111,34 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
}
strbuf_release(&filename);
}
+
+void set_title_from_path(const char *path)
+{
+ size_t path_len, path_index, path_last_end;
+ char *new_title;
+
+ if (!path)
+ return;
+
+ path_len = strlen(path);
+ new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1);
+ new_title[0] = '\0';
+
+ for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) {
+ if (path[path_index] == '/') {
+ if (path_index == path_len - 1) {
+ path_last_end = path_index - 1;
+ continue;
+ }
+ strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
+ strcat(new_title, "\\");
+ path_last_end = path_index;
+ }
+ }
+ if (path_last_end)
+ strncat(new_title, path, path_last_end);
+
+ strcat(new_title, " - ");
+ strcat(new_title, ctx.page.title);
+ ctx.page.title = new_title;
+}
diff --git a/ui-shared.h b/ui-shared.h
index 87799f1..7948867 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -77,4 +77,6 @@ extern void cgit_print_snapshot_links(const char *repo, const char *head,
const char *hex, int snapshots);
extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
const char *page);
+
+extern void set_title_from_path(const char *path);
#endif /* UI_SHARED_H */
diff --git a/ui-tree.c b/ui-tree.c
index ca24a03..12eaaf0 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -84,37 +84,6 @@ static void print_binary_buffer(char *buf, unsigned long size)
html("</table>\n");
}
-static void set_title_from_path(const char *path)
-{
- size_t path_len, path_index, path_last_end;
- char *new_title;
-
- if (!path)
- return;
-
- path_len = strlen(path);
- new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1);
- new_title[0] = '\0';
-
- for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) {
- if (path[path_index] == '/') {
- if (path_index == path_len - 1) {
- path_last_end = path_index - 1;
- continue;
- }
- strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
- strcat(new_title, "\\");
- path_last_end = path_index;
- }
- }
- if (path_last_end)
- strncat(new_title, path, path_last_end);
-
- strcat(new_title, " - ");
- strcat(new_title, ctx.page.title);
- ctx.page.title = new_title;
-}
-
static void print_object(const unsigned char *sha1, char *path, const char *basename, const char *rev)
{
enum object_type type;
--
2.9.4
next prev parent reply other threads:[~2017-09-27 22:43 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 2:18 [RFC PATCH 0/4] Add ui-blame whydoubt
2017-06-08 2:18 ` [RFC PATCH 1/4] git: update to v2.14 whydoubt
2017-07-22 11:25 ` john
2017-06-08 2:18 ` [RFC PATCH 2/4] ui-blame: create placeholder and links whydoubt
2017-07-22 11:31 ` john
2017-06-08 2:18 ` [RFC PATCH 3/4] ui-blame: create needed html_ntxt_noellipsis function whydoubt
2017-07-22 11:36 ` john
2017-06-08 2:18 ` [RFC PATCH 4/4] ui-blame: fill in the contents whydoubt
2017-07-05 8:32 ` list
2017-07-22 11:47 ` john
2017-06-08 9:00 ` [RFC PATCH 0/4] Add ui-blame list
2017-07-22 12:02 ` john
2017-08-05 0:23 ` dlcampbell
2017-08-05 0:57 ` whydoubt
2017-08-24 18:14 ` list
2017-08-31 13:05 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 0/7] " whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 1/7] ui-blame: create enable-blame config item whydoubt
2017-09-23 15:46 ` john
2017-09-24 3:12 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 2/7] ui-blame: create framework whydoubt
2017-09-23 15:47 ` john
2017-09-24 3:24 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 3/7] ui-blame: create links whydoubt
2017-09-23 15:47 ` john
2017-09-24 20:25 ` whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 4/7] ui-blame: html_ntxt with no ellipsis whydoubt
2017-09-23 15:47 ` john
2017-09-23 3:38 ` [RFCv2 PATCH 5/7] ui-blame: pull blame info from libgit whydoubt
2017-09-23 15:47 ` john
2017-09-24 19:06 ` whydoubt
2017-09-24 20:09 ` whydoubt
2017-09-24 20:52 ` john
2017-09-23 3:38 ` [RFCv2 PATCH 6/7] ui-blame: begin building whydoubt
2017-09-23 3:38 ` [RFCv2 PATCH 7/7] ui-blame: generate blame page when requested whydoubt
2017-09-23 15:53 ` [RFCv2 PATCH 0/7] Add ui-blame john
2017-09-24 3:05 ` whydoubt
2017-09-27 22:43 ` [PATCH 0/5] " whydoubt
2017-09-27 22:43 ` [PATCH 1/5] html: html_ntxt with no ellipsis whydoubt
2017-09-30 11:55 ` john
2017-09-27 22:43 ` whydoubt [this message]
2017-09-30 11:56 ` [PATCH 2/5] ui-tree: move set_title_from_path to ui-shared john
2017-09-27 22:43 ` [PATCH 3/5] ui-shared: make a char* parameter const whydoubt
2017-09-30 12:00 ` john
2017-09-27 22:43 ` [PATCH 4/5] ui-blame: add blame UI whydoubt
2017-09-30 12:07 ` john
2017-09-27 22:43 ` [PATCH 5/5] ui-tree: link to blame UI if enabled whydoubt
2017-09-30 12:08 ` john
2017-09-30 12:10 ` [PATCH 0/5] Add ui-blame john
2017-10-02 1:17 ` Jason
2017-10-02 5:34 ` list
2017-10-02 22:35 ` whydoubt
2017-10-02 23:29 ` list
2017-10-03 18:22 ` john
2017-10-03 18:23 ` Jason
2017-10-03 18:36 ` Jason
2017-10-03 19:06 ` whydoubt
2017-10-02 4:39 ` [PATCHv2 " whydoubt
2017-10-02 4:39 ` [PATCHv2 1/5] html: html_ntxt with no ellipsis whydoubt
2017-10-02 4:39 ` [PATCHv2 2/5] ui-tree: move set_title_from_path to ui-shared whydoubt
2017-10-02 4:39 ` [PATCHv2 3/5] ui-shared: make a char* parameter const whydoubt
2017-10-02 4:39 ` [PATCHv2 4/5] ui-blame: add blame UI whydoubt
2017-10-02 4:39 ` [PATCHv2 5/5] ui-tree: link to blame UI if enabled whydoubt
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=20170927224331.26494-3-whydoubt@gmail.com \
--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).