commit dfb5eb393cd9d879637f6a643f31593ef8c654fa from: Omar Polo date: Sun Jul 25 10:10:03 2021 UTC move load_*_url as static fns only defined in telescope.c commit - ab0a42744b90d8cb40c1e7e2ab98e360bcd49bce commit + dfb5eb393cd9d879637f6a643f31593ef8c654fa blob - 4ff81ed2913c91b22e0e086708c6ab8f99d60237 blob + e2ed9c29c34d93bbed3ddc09bf911fb2f5a29eaf --- telescope.c +++ telescope.c @@ -53,14 +53,6 @@ enum telescope_process { PROC_NET, }; -static struct proto protos[] = { - { "about", load_about_url }, - { "finger", load_finger_url }, - { "gemini", load_gemini_url }, - { NULL, NULL }, -}; - - #define CANNOT_FETCH 0 #define TOO_MUCH_REDIRECTS 1 #define MALFORMED_RESPONSE 2 @@ -110,12 +102,24 @@ static void handle_imsg_save_cert_ok(struct imsg*, s static void handle_imsg_update_cert_ok(struct imsg *, size_t); static void handle_dispatch_imsg(int, short, void*); static void load_page_from_str(struct tab*, const char*); +static void load_about_url(struct tab*, const char*); +static void load_finger_url(struct tab *, const char *); +static void load_gemini_url(struct tab*, const char*); +static void load_via_proxy(struct tab *, const char *, + struct proxy *); static int do_load_url(struct tab*, const char *, const char *); static void parse_session_line(char *, const char **, uint32_t *); static void load_last_session(void); static pid_t start_child(enum telescope_process, const char *, int); static int ui_send_net(int, uint32_t, const void *, uint16_t); static int ui_send_fs(int, uint32_t, const void *, uint16_t); + +static struct proto protos[] = { + { "about", load_about_url }, + { "finger", load_finger_url }, + { "gemini", load_gemini_url }, + { NULL, NULL }, +}; static imsg_handlerfn *handlers[] = { [IMSG_ERR] = handle_imsg_err, @@ -562,7 +566,7 @@ load_page_from_str(struct tab *tab, const char *page) ui_on_tab_loaded(tab); } -void +static void load_about_url(struct tab *tab, const char *url) { tab->trust = TS_VERIFIED; @@ -573,7 +577,7 @@ load_about_url(struct tab *tab, const char *url) tab->hist_cur->h, strlen(tab->hist_cur->h)+1); } -void +static void load_finger_url(struct tab *tab, const char *url) { struct get_req req; @@ -619,7 +623,7 @@ load_finger_url(struct tab *tab, const char *url) textplain_initparser(&tab->buffer.page); } -void +static void load_gemini_url(struct tab *tab, const char *url) { struct get_req req; @@ -640,7 +644,7 @@ load_gemini_url(struct tab *tab, const char *url) &req, sizeof(req)); } -void +static void load_via_proxy(struct tab *tab, const char *url, struct proxy *p) { struct get_req req; blob - 263bcb83c28c1289b993ac7ea39632c0d313937f blob + 93fa4d640917a31c152c38fa8357eafc58809df1 --- telescope.h +++ telescope.h @@ -323,10 +323,6 @@ void sandbox_ui_process(void); void sandbox_fs_process(void); /* telescope.c */ -void load_about_url(struct tab*, const char*); -void load_finger_url(struct tab *, const char *); -void load_gemini_url(struct tab*, const char*); -void load_via_proxy(struct tab *, const char *, struct proxy *); void load_url(struct tab *, const char *, const char *); int load_previous_page(struct tab*); int load_next_page(struct tab*);