From 3483af0f0f605a01b9524aeb1e333cda59ba35f6 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Tue, 28 Mar 2023 10:16:14 -0600 Subject: style: enforce webkit style for plugins $ clang-format -style=webkit -i */.c $ clang-format -style=webkit -i */*/.c --- plugins/libre_redirect/libre_redirect.c | 106 +++++++++++----------- plugins/libre_redirect/str_replace_start.c | 82 +++++++++-------- plugins/libre_redirect/str_replace_test/example.c | 25 ++--- plugins/readability/readability.c | 31 ++++--- plugins/style/style.c | 31 ++++--- 5 files changed, 141 insertions(+), 134 deletions(-) (limited to 'plugins') diff --git a/plugins/libre_redirect/libre_redirect.c b/plugins/libre_redirect/libre_redirect.c index 4beb400..3794add 100644 --- a/plugins/libre_redirect/libre_redirect.c +++ b/plugins/libre_redirect/libre_redirect.c @@ -1,6 +1,6 @@ -#include -#include #include +#include +#include #include "str_replace_start.h" @@ -13,72 +13,72 @@ void str_init(char* str, int n) { - for(int i = 0; i < n; i++) - str[i] = ' '; - str[n] = '\0'; + for (int i = 0; i < n; i++) + str[i] = ' '; + str[n] = '\0'; } // could also use int libre_redirect(const char* uri, char* output) { - int l1 = strlen(uri); - int l2 = strlen(output); - int len; - char tmp_uri[l2++]; - char tmp_output[l2++]; + int l1 = strlen(uri); + int l2 = strlen(output); + int len; + char tmp_uri[l2++]; + char tmp_output[l2++]; - if ((l2 - l1) < LIBRE_N) { + if ((l2 - l1) < LIBRE_N) { #ifdef DEBUG - printf("Not enough memory\n"); + printf("Not enough memory\n"); #endif - return 1; // not enough memory. - } else { - strcpy(tmp_uri, uri); // strcpy also copies the terminating '\0' - strcpy(tmp_output, output); + return 1; // not enough memory. + } else { + strcpy(tmp_uri, uri); // strcpy also copies the terminating '\0' + strcpy(tmp_output, output); - char* annoying_sites[] = { - "https://www.youtube.com", - "https://www.reddit.com", - "https://medium.com", - "https://translate.google.com", - // "https://forum.effectivealtruism.org", - "https://www.bloomberg.com", - "https://twitter.com" - }; + char* annoying_sites[] = { + "https://www.youtube.com", + "https://www.reddit.com", + "https://medium.com", + "https://translate.google.com", + // "https://forum.effectivealtruism.org", + "https://www.bloomberg.com", + "https://twitter.com" + }; - char* alternatives[] = { - "https://yt.artemislena.eu", - "https://teddit.nunosempere.com", - "https://scribe.rip", - "https://simplytranslate.org/", - // "https://ea.greaterwrong.com", - "https://archive.is/https://www.bloomberg.com", - "https://nitter.net" - }; + char* alternatives[] = { + "https://yt.artemislena.eu", + "https://teddit.nunosempere.com", + "https://scribe.rip", + "https://simplytranslate.org/", + // "https://ea.greaterwrong.com", + "https://archive.is/https://www.bloomberg.com", + "https://nitter.net" + }; - len = sizeof(annoying_sites) / sizeof(annoying_sites[0]); + len = sizeof(annoying_sites) / sizeof(annoying_sites[0]); - for (int i = 0; i < len; i++) { - int replace_check = str_replace_start(tmp_uri, annoying_sites[i], - alternatives[i], output); - if (replace_check == 2) { + for (int i = 0; i < len; i++) { + int replace_check = str_replace_start(tmp_uri, annoying_sites[i], + alternatives[i], output); + if (replace_check == 2) { #ifdef DEBUG - printf("tmp_uri: %s\n", tmp_uri); - printf("output: %s\n", output); + printf("tmp_uri: %s\n", tmp_uri); + printf("output: %s\n", output); #endif - return 2; - } else if (replace_check == 1) { + return 2; + } else if (replace_check == 1) { #ifdef DEBUG - printf("replace_check failed\n"); + printf("replace_check failed\n"); #endif - return 1; - } - strcpy(tmp_uri, output); - str_init(output, l2); - } - strcpy(output, tmp_uri); - } + return 1; + } + strcpy(tmp_uri, output); + str_init(output, l2); + } + strcpy(output, tmp_uri); + } #ifdef DEBUG - printf("No match found\n\n"); + printf("No match found\n\n"); #endif - return 0; + return 0; } diff --git a/plugins/libre_redirect/str_replace_start.c b/plugins/libre_redirect/str_replace_start.c index 6bdfc69..d1fe083 100644 --- a/plugins/libre_redirect/str_replace_start.c +++ b/plugins/libre_redirect/str_replace_start.c @@ -1,6 +1,6 @@ -#include #include #include +#include #define DEBUG false @@ -12,50 +12,54 @@ See also: int str_replace_start(const char* string, const char* target, const char* replacement, char* output) { - int l1 = strlen(string); - int l2 = strlen(target); - int l3 = strlen(replacement); - int l4 = strlen(output); - if(DEBUG) printf("%d,%d,%d,%d\n", l1, l2, l3, l4); - // if(DEBUG) printf("%s,%s,%s,%s\n", string, target, replacement, output); + int l1 = strlen(string); + int l2 = strlen(target); + int l3 = strlen(replacement); + int l4 = strlen(output); + if (DEBUG) + printf("%d,%d,%d,%d\n", l1, l2, l3, l4); + // if(DEBUG) printf("%s,%s,%s,%s\n", string, target, replacement, output); - if((l4 < (l1 - l2 + l3)) || l4 < l1 ){ - // Not enough memory in output string. - if(DEBUG) printf("String not long enough.\n"); - return 1; - } - /* else if(l1 < l2){ + if ((l4 < (l1 - l2 + l3)) || l4 < l1) { + // Not enough memory in output string. + if (DEBUG) + printf("String not long enough.\n"); + return 1; + } + /* else if(l1 < l2){ // Not even possible that there is a match. if(DEBUG) printf("Target larger than string.\n"); strcpy(output, string); } */ - else { - if(DEBUG) printf("Looking for a match for %s in %s.\n", target, string); - int match = true; - for(int i=0; i #include +#include -int main(){ - char uri[] = "https://reddit.com/r/blah"; +int main() +{ + char uri[] = "https://reddit.com/r/blah"; - int l = LIBRE_N + strlen(uri) + 1; - char uri_filtered[l]; - str_init(uri_filtered, l); + int l = LIBRE_N + strlen(uri) + 1; + char uri_filtered[l]; + str_init(uri_filtered, l); - if (!libre_redirect(uri, uri_filtered)) { - printf("Filtered uri: %s\n", uri_filtered); - } else { - printf("Uri: %s\n", uri); - // failure; do something with the original uri. - } + if (!libre_redirect(uri, uri_filtered)) { + printf("Filtered uri: %s\n", uri_filtered); + } else { + printf("Uri: %s\n", uri); + // failure; do something with the original uri. + } } diff --git a/plugins/readability/readability.c b/plugins/readability/readability.c index 2afc63b..bc2f02f 100644 --- a/plugins/readability/readability.c +++ b/plugins/readability/readability.c @@ -1,22 +1,23 @@ #include -#include #include +#include #define READABILITY_N 85133 + 1000 -void read_readability_js(char* string){ - FILE *fp=fopen("/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot/plugins/readability/readability.js", "r"); - if (!fp) { // fp is NULL, fopen failed - fprintf(stderr, "Failed to open file\n"); - string=NULL; - return; - } - int i=0; - int c; - while ((c = fgetc(fp)) != EOF){ - string[i++] = c; - } - string[i]='\0'; - fclose(fp); +void read_readability_js(char* string) +{ + FILE* fp = fopen("/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot/plugins/readability/readability.js", "r"); + if (!fp) { // fp is NULL, fopen failed + fprintf(stderr, "Failed to open file\n"); + string = NULL; + return; + } + int i = 0; + int c; + while ((c = fgetc(fp)) != EOF) { + string[i++] = c; + } + string[i] = '\0'; + fclose(fp); } /* diff --git a/plugins/style/style.c b/plugins/style/style.c index 3aa5144..1010506 100644 --- a/plugins/style/style.c +++ b/plugins/style/style.c @@ -1,22 +1,23 @@ #include -#include #include +#include #define STYLE_N 1393 + 1 -void read_style_js(char* string){ - FILE *fp=fopen("/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot/plugins/style/style.js", "r"); - if (!fp) { // fp is NULL, fopen failed - fprintf(stderr, "Failed to open file\n"); - string=NULL; - return; - } - int i=0; - int c; - while ((c = fgetc(fp)) != EOF){ - string[i++] = c; - } - string[i]='\0'; - fclose(fp); +void read_style_js(char* string) +{ + FILE* fp = fopen("/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot/plugins/style/style.js", "r"); + if (!fp) { // fp is NULL, fopen failed + fprintf(stderr, "Failed to open file\n"); + string = NULL; + return; + } + int i = 0; + int c; + while ((c = fgetc(fp)) != EOF) { + string[i++] = c; + } + string[i] = '\0'; + fclose(fp); } /* -- cgit v1.2.3