aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Run clang-format on new editor code

Browse Source
This commit is contained in:
Michael Vetter 2021-04-16 17:55:17 +02:00
parent f5e1f9fa63
commit 880ce20018
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/cmd_defs.c
View File

@ -2908,7 +2908,7 @@ command_mangen(void)
GDateTime* now = g_date_time_new_now_local(); GDateTime* now = g_date_time_new_now_local();
gchar* date = g_date_time_format(now, "%F"); gchar* date = g_date_time_format(now, "%F");
gchar *header = g_strdup_printf(".TH man 1 \"%s\" \"" PACKAGE_VERSION "\" \"Profanity XMPP client\"\n", date); gchar* header = g_strdup_printf(".TH man 1 \"%s\" \"" PACKAGE_VERSION "\" \"Profanity XMPP client\"\n", date);
if (!header) { if (!header) {
log_error("command_mangen(): could not allocate memory"); log_error("command_mangen(): could not allocate memory");
return; return;

34
src/command/cmd_funcs.c
View File

@ -6867,7 +6867,7 @@ cmd_plugins_sourcepath(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} }
char *path = get_expanded_path(args[2]); char* path = get_expanded_path(args[2]);
if (!is_dir(path)) { if (!is_dir(path)) {
cons_show("Plugins sourcepath must be a directory."); cons_show("Plugins sourcepath must be a directory.");
@ -6888,7 +6888,7 @@ cmd_plugins_sourcepath(ProfWin* window, const char* const command, gchar** args)
gboolean gboolean
cmd_plugins_install(ProfWin* window, const char* const command, gchar** args) cmd_plugins_install(ProfWin* window, const char* const command, gchar** args)
{ {
char *path; char* path;
if (args[1] == NULL) { if (args[1] == NULL) {
char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH); char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH);
@ -9315,10 +9315,10 @@ gboolean
cmd_editor(ProfWin* window, const char* const command, gchar** args) cmd_editor(ProfWin* window, const char* const command, gchar** args)
{ {
/* Build temp file name */ /* Build temp file name */
GString * tempfile = g_string_new(g_get_tmp_dir()); GString* tempfile = g_string_new(g_get_tmp_dir());
g_string_append(tempfile, "/profanity-"); g_string_append(tempfile, "/profanity-");
xmpp_ctx_t* const ctx = connection_get_ctx(); xmpp_ctx_t* const ctx = connection_get_ctx();
if(!ctx) { if (!ctx) {
cons_show("Editor: Not connection"); cons_show("Editor: Not connection");
return TRUE; return TRUE;
} }
@ -9336,16 +9336,16 @@ cmd_editor(ProfWin* window, const char* const command, gchar** args)
// Check if file exists and create file // Check if file exists and create file
if (g_file_test(filename, G_FILE_TEST_EXISTS)) { if (g_file_test(filename, G_FILE_TEST_EXISTS)) {
cons_show("Editor: The temp file exists"); cons_show("Editor: The temp file exists");
g_string_free (tempfile, TRUE); g_string_free(tempfile, TRUE);
return TRUE; return TRUE;
} }
GError* creation_error = NULL; GError* creation_error = NULL;
GFile* file = g_file_new_for_path(filename); GFile* file = g_file_new_for_path(filename);
GFileOutputStream* fos = g_file_create (file, GFileOutputStream* fos = g_file_create(file,
G_FILE_CREATE_PRIVATE, NULL, G_FILE_CREATE_PRIVATE, NULL,
&creation_error); &creation_error);
if ( creation_error ) { if (creation_error) {
cons_show_error("Editor: Error during file creation"); cons_show_error("Editor: Error during file creation");
return TRUE; return TRUE;
} }
@ -9359,14 +9359,14 @@ cmd_editor(ProfWin* window, const char* const command, gchar** args)
// Fork / exec // Fork / exec
pid_t pid = fork(); pid_t pid = fork();
if( pid == 0 ) { if (pid == 0) {
int x = execl(editor, editor, g_file_get_path(file), (char *) NULL); int x = execl(editor, editor, g_file_get_path(file), (char*)NULL);
if ( x == -1 ) { if (x == -1) {
cons_show_error("Failed to exec %s", editor); cons_show_error("Failed to exec %s", editor);
} }
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} else { } else {
if ( pid == -1 ) { if (pid == -1) {
return TRUE; return TRUE;
} }
int status = 0; int status = 0;
@ -9375,8 +9375,8 @@ cmd_editor(ProfWin* window, const char* const command, gchar** args)
const size_t COUNT = 8192; const size_t COUNT = 8192;
char buf[COUNT]; char buf[COUNT];
ssize_t size_read = read(fd_input_file, buf, COUNT); ssize_t size_read = read(fd_input_file, buf, COUNT);
if(size_read > 0 && size_read <= COUNT ) { if (size_read > 0 && size_read <= COUNT) {
buf[size_read-1] = '\0'; buf[size_read - 1] = '\0';
GString* text = g_string_new(buf); GString* text = g_string_new(buf);
ProfWin* win = wins_get_current(); ProfWin* win = wins_get_current();
win_println(win, THEME_DEFAULT, "!", "EDITOR PREVIEW: %s", text->str); win_println(win, THEME_DEFAULT, "!", "EDITOR PREVIEW: %s", text->str);
@ -9386,8 +9386,8 @@ cmd_editor(ProfWin* window, const char* const command, gchar** args)
close(fd_input_file); close(fd_input_file);
GError* deletion_error = NULL; GError* deletion_error = NULL;
g_file_delete (file, NULL, &deletion_error); g_file_delete(file, NULL, &deletion_error);
if ( deletion_error ) { if (deletion_error) {
cons_show("Editor: Error during file deletion"); cons_show("Editor: Error during file deletion");
return TRUE; return TRUE;
} }