summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/auth.c44
-rw-r--r--src/config.c10
-rw-r--r--src/http.c10
-rw-r--r--src/instance_info.c6
-rw-r--r--src/log.c2
-rw-r--r--src/login_window.c6
6 files changed, 38 insertions, 40 deletions
diff --git a/src/auth.c b/src/auth.c
index ab37016..3a2ee17 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -20,7 +20,7 @@ int read_local_credentials()
{
if (!(config->access_token) || !*(config->access_token) ||
!(config->instance_url) || !*(config->instance_url)) {
- log_msg(LOG_ERROR, "read_local_credentials",
+ log_msg(LOG_WARNING, "read_local_credentials",
"access_token not found");
return -1;
}
@@ -60,36 +60,36 @@ static void *register_call(void *req_arg)
arg = (struct register_call_arg *)req_arg;
if (!arg || !(arg->url)) {
- log_msg(LOG_ERROR, "register_call", "invalid arguments");
+ log_msg(LOG_WARNING, "register_call", "invalid arguments");
goto error;
}
resp = post_request(arg->url, arg->post_data);
if (!resp) {
- log_msg(LOG_ERROR, "register_call", "failed to send http request");
+ log_msg(LOG_WARNING, "register_call", "failed to send http request");
goto error;
}
if (!resp) {
- log_msg(LOG_ERROR, "register_call", "null response");
+ log_msg(LOG_WARNING, "register_call", "null response");
goto error;
}
root = json_loads(resp, 0, NULL);
if (!root) {
- log_msg(LOG_ERROR, "register_call", "failed to parse json");
+ log_msg(LOG_WARNING, "register_call", "failed to parse json");
goto error;
}
if (!json_is_object(root)) {
- log_msg(LOG_ERROR, "register_call", "json root is not object");
+ log_msg(LOG_WARNING, "register_call", "json root is not object");
goto error;
}
json_t *cid = json_object_get(root, "client_id");
json_t *csec = json_object_get(root, "client_secret");
if (!json_is_string(cid) || !json_is_string(csec)) {
- log_msg(LOG_ERROR, "register_call",
+ log_msg(LOG_WARNING, "register_call",
"invalid client_id or client_secret");
goto error;
}
@@ -98,7 +98,7 @@ static void *register_call(void *req_arg)
config_set_client_secret(json_string_value(csec));
config_set_instance_url(arg->domain);
if (!*(config->client_id) || !*(config->client_secret)) {
- log_msg(LOG_ERROR, "register_call",
+ log_msg(LOG_WARNING, "register_call",
"invalid client_id or client_secret");
goto error;
}
@@ -139,7 +139,7 @@ int register_app(const char *instance, void (*callback)(bool success))
pthread_t t;
if (!instance || strlen(instance) < 1 || !callback) {
- log_msg(LOG_ERROR, "register_app", "invalid argument");
+ log_msg(LOG_WARNING, "register_app", "invalid argument");
return -1;
}
@@ -157,7 +157,7 @@ int register_app(const char *instance, void (*callback)(bool success))
"read write push");
if (!root) {
- log_msg(LOG_ERROR, "register_app", "json pack error: line %d: %s",
+ log_msg(LOG_WARNING, "register_app", "json pack error: line %d: %s",
error.line, error.text);
return -1;
}
@@ -165,7 +165,7 @@ int register_app(const char *instance, void (*callback)(bool success))
req_data = json_dumps(root, 0);
json_decref(root);
if (!req_data) {
- log_msg(LOG_ERROR, "register_app", "failed to dump json");
+ log_msg(LOG_WARNING, "register_app", "failed to dump json");
return -1;
}
@@ -206,29 +206,29 @@ static void *login_call(void *req_arg)
arg = (struct login_call_arg *)req_arg;
if (!arg || !(arg->url)) {
- log_msg(LOG_ERROR, "login_call", "invalid arguments");
+ log_msg(LOG_WARNING, "login_call", "invalid arguments");
goto error;
}
resp = post_request(arg->url, arg->post_data);
if (!resp) {
- log_msg(LOG_ERROR, "login_call", "failed to send http request");
+ log_msg(LOG_WARNING, "login_call", "failed to send http request");
goto error;
}
if (!resp) {
- log_msg(LOG_ERROR, "login_call", "null response");
+ log_msg(LOG_WARNING, "login_call", "null response");
goto error;
}
root = json_loads(resp, 0, NULL);
if (!root) {
- log_msg(LOG_ERROR, "login_call", "failed to parse json");
+ log_msg(LOG_WARNING, "login_call", "failed to parse json");
goto error;
}
if (!json_is_object(root)) {
- log_msg(LOG_ERROR, "login_call", "json root is not object");
+ log_msg(LOG_WARNING, "login_call", "json root is not object");
goto error;
}
@@ -237,7 +237,7 @@ static void *login_call(void *req_arg)
if (!json_is_string(access_token_j) || !json_is_string(scope_j) ||
strlen(json_string_value(access_token_j)) < 1 ||
strlen(json_string_value(scope_j)) < 1) {
- log_msg(LOG_ERROR, "login_call", "invalid access_token or scope");
+ log_msg(LOG_WARNING, "login_call", "invalid access_token or scope");
goto error;
}
@@ -245,7 +245,7 @@ static void *login_call(void *req_arg)
/* scope = strdup(json_string_value(scope_j)); */
if (config_save()) {
- log_msg(LOG_ERROR, "login_call", "failed to save config");
+ log_msg(LOG_WARNING, "login_call", "failed to save config");
goto error;
}
@@ -287,14 +287,14 @@ int login(
struct login_call_arg *arg;
if (!email || strlen(email) < 1 || !password || strlen(password) < 1) {
- log_msg(LOG_ERROR, "login", "invalid argument");
+ log_msg(LOG_WARNING, "login", "invalid argument");
return -1;
}
if (!(config->client_id) || !*(config->client_id) ||
!(config->client_secret) || !*(config->client_secret) ||
!(config->instance_url) || !*(config->instance_url)) {
- log_msg(LOG_ERROR, "login", "invalid client_id or client_secret");
+ log_msg(LOG_WARNING, "login", "invalid client_id or client_secret");
return -1;
}
@@ -303,7 +303,7 @@ int login(
"grant_type", "password", "username", email, "password", password);
if (!root) {
- log_msg(LOG_ERROR, "login", "json pack error: line %d: %s",
+ log_msg(LOG_WARNING, "login", "json pack error: line %d: %s",
error.line, error.text);
return -1;
}
@@ -311,7 +311,7 @@ int login(
req_data = json_dumps(root, 0);
json_decref(root);
if (!req_data) {
- log_msg(LOG_ERROR, "login", "failed to dump json");
+ log_msg(LOG_WARNING, "login", "failed to dump json");
return -1;
}
diff --git a/src/config.c b/src/config.c
index c4aecf0..ca2d48e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -38,7 +38,7 @@ void config_load()
char *path = get_config_path();
root = json_load_file(path, 0, &error);
if (!root) {
- log_msg(LOG_ERROR, "load_config", "json parse error: line %d: %s",
+ log_msg(LOG_WARNING, "load_config", "json parse error: line %d: %s",
error.line, error.text);
free(path);
return;
@@ -46,7 +46,7 @@ void config_load()
free(path);
if (!json_is_object(root)) {
- log_msg(LOG_ERROR, "load_config", "json root is not object");
+ log_msg(LOG_WARNING, "load_config", "json root is not object");
json_decref(root);
return;
}
@@ -85,7 +85,7 @@ int config_save()
_config.access_token);
if (!root) {
- log_msg(LOG_ERROR, "register_app", "json pack error: line %d: %s",
+ log_msg(LOG_WARNING, "register_app", "json pack error: line %d: %s",
error.line, error.text);
return -1;
}
@@ -96,14 +96,14 @@ int config_save()
if (stat(dir, &st)) {
if (mkdir(dir, S_IRWXU)) {
free(config_path);
- log_msg(LOG_ERROR, "load_config", "failed to create config dir");
+ log_msg(LOG_WARNING, "load_config", "failed to create config dir");
return -1;
}
}
free(config_path);
if (json_dump_file(root, get_config_path(), 0)) {
- log_msg(LOG_ERROR, "load_config", "unable to save json");
+ log_msg(LOG_WARNING, "load_config", "unable to save json");
json_decref(root);
return -1;
}
diff --git a/src/http.c b/src/http.c
index ec1ecc5..96a723d 100644
--- a/src/http.c
+++ b/src/http.c
@@ -32,7 +32,7 @@ static size_t write_response(void *ptr, size_t size, size_t nmemb, void *stream)
struct write_result *result = (struct write_result *)stream;
if (result->pos + size * nmemb >= BUFFER_SIZE - 1) {
- log_msg(LOG_ERROR, "write_response", "buffer too small");
+ log_msg(LOG_WARNING, "write_response", "buffer too small");
return 0;
}
@@ -77,7 +77,7 @@ char *get_request(const char *url)
status = curl_easy_perform(curl);
if (status != 0) {
- log_msg(LOG_ERROR, "get_request",
+ log_msg(LOG_WARNING, "get_request",
"unable to request data from %s: %s", url,
curl_easy_strerror(status));
goto error;
@@ -85,7 +85,7 @@ char *get_request(const char *url)
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
if (code != 200) {
- log_msg(LOG_ERROR, "get_request", "server responded with code %ld",
+ log_msg(LOG_WARNING, "get_request", "server responded with code %ld",
code);
goto error;
}
@@ -146,14 +146,14 @@ char *post_request(const char *url, char *post_data)
status = curl_easy_perform(curl);
if (status != 0) {
- log_msg(LOG_ERROR, "post_request", "unable to request data from %s: %s",
+ log_msg(LOG_WARNING, "post_request", "unable to request data from %s: %s",
url, curl_easy_strerror(status));
goto error;
}
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
if (code != 200) {
- log_msg(LOG_ERROR, "post_request", "server responded with code %ld", code);
+ log_msg(LOG_WARNING, "post_request", "server responded with code %ld", code);
goto error;
}
diff --git a/src/instance_info.c b/src/instance_info.c
index 7b9326e..3c13ebd 100644
--- a/src/instance_info.c
+++ b/src/instance_info.c
@@ -15,20 +15,20 @@ struct instance_info *instance_info_from_json(char *json_data)
root = json_loads(json_data, 0, &error);
if (!root) {
- log_msg(LOG_ERROR, "instance_info_from_json", "error: on line %d: %s",
+ log_msg(LOG_WARNING, "instance_info_from_json", "error: on line %d: %s",
error.line, error.text);
return NULL;
}
if (!json_is_object(root)) {
- log_msg(LOG_ERROR, "instance_info_from_json", "root is not object");
+ log_msg(LOG_WARNING, "instance_info_from_json", "root is not object");
json_decref(root);
return NULL;
}
json_t *title = json_object_get(root, "title");
if (!json_is_string(title)) {
- log_msg(LOG_ERROR, "instance_info_from_json", "title is not string");
+ log_msg(LOG_WARNING, "instance_info_from_json", "title is not string");
return NULL;
}
info->title = strdup(json_string_value(title));
diff --git a/src/log.c b/src/log.c
index 52d7028..3c78caf 100644
--- a/src/log.c
+++ b/src/log.c
@@ -18,7 +18,7 @@ void log_msg(enum log_level level, const char *namespace, const char *format, ..
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
- if (level == LOG_ERROR) {
+ if (level == LOG_WARNING) {
exit(EXIT_FAILURE);
} else if (level == LOG_FATAL) {
abort();
diff --git a/src/login_window.c b/src/login_window.c
index 8bf82c1..f1823b9 100644
--- a/src/login_window.c
+++ b/src/login_window.c
@@ -26,12 +26,11 @@ static void window_removed(
static void login_callback(bool success)
{
if (!success) {
- log_msg(LOG_ERROR, "login_callback", "login failed");
+ log_msg(LOG_WARNING, "login_callback", "login failed");
gtk_spinner_stop(GTK_SPINNER(spinner));
return;
}
- printf("login success\n");
gtk_spinner_stop(GTK_SPINNER(spinner));
create_timeline_window(application, NULL);
/* gtk_window_close(GTK_WINDOW(window)); */
@@ -43,10 +42,9 @@ static void register_callback(bool success)
{
if (!success) {
gtk_spinner_stop(GTK_SPINNER(spinner));
- log_msg(LOG_ERROR, "register_callback", "register failed");
+ log_msg(LOG_WARNING, "register_callback", "register failed");
return;
}
- printf("register success\n");
const char *email, *password;
email = gtk_entry_get_text(GTK_ENTRY(email_box));
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 13:29:42 +0000