whitespace consistency

diff --git a/source/input.c b/source/input.c
index 883305e23d99b0f2e2d23127a42405b61710f485..4333454d04f5919416f42c37bdd4ddf22b710c86 100644 (file)
--- a/source/input.c
+++ b/source/input.c
@@ -36,53 +36,53 @@ static void handle_cd(void) {
 }
 
 static void handle_scroll_to_top(void) {
-       workdir_scroll_to_top(state_get_focused_frame()->workdir);
+    workdir_scroll_to_top(state_get_focused_frame()->workdir);
 }
 static void handle_scroll_to_bottom(void) {
-       workdir_scroll_to_bot(state_get_focused_frame()->workdir);
+    workdir_scroll_to_bot(state_get_focused_frame()->workdir);
 }
 static void handle_page_up(void){
-       screen_frame_page_up(state_get_focused_frame());
+    screen_frame_page_up(state_get_focused_frame());
 }
 static void handle_page_down(void){
-       screen_frame_page_down(state_get_focused_frame());
+    screen_frame_page_down(state_get_focused_frame());
 }
 static void handle_expand(void){
-       workdir_expand_selected(state_get_focused_frame()->workdir);
+    workdir_expand_selected(state_get_focused_frame()->workdir);
 }
 static void handle_collapse(void){
-       workdir_collapse_selected(state_get_focused_frame()->workdir);
+    workdir_collapse_selected(state_get_focused_frame()->workdir);
 }
 
 
 static void search_mode(void){
-       int searchcap = 8;
-       char* searchstr = malloc(sizeof(char)*searchcap);
-       int searchlen = 0;
-       bool searching = true;
-       state_set_mode(MODE_SEARCH);
-       while(searching){
-               char inpt = getch();
-               if(inpt == ERR){ /* do nothing */
-               }else if(inpt == ESC){
-                       searching = false;
-               }else if (inpt == '\n'){
-                       searching = false;
-                       handle_cd();
-               }else{
-                       if(searchlen+1 >= searchcap){
-                               searchcap *= 2;
-                               searchstr = realloc(searchstr, sizeof(char)*searchcap);
-                       }
-                       searchstr[searchlen] = inpt;
-                       searchlen += 1;
-                       searchstr[searchlen] = 0;
-                       workdir_seek(state_get_focused_frame()->workdir, searchstr);
-               }
+    int searchcap = 8;
+    char* searchstr = malloc(sizeof(char)*searchcap);
+    int searchlen = 0;
+    bool searching = true;
+    state_set_mode(MODE_SEARCH);
+    while(searching){
+        char inpt = getch();
+        if(inpt == ERR){ /* do nothing */
+        }else if(inpt == ESC){
+            searching = false;
+        }else if (inpt == '\n'){
+            searching = false;
+            handle_cd();
+        }else{
+            if(searchlen+1 >= searchcap){
+                searchcap *= 2;
+                searchstr = realloc(searchstr, sizeof(char)*searchcap);
+            }
+            searchstr[searchlen] = inpt;
+            searchlen += 1;
+            searchstr[searchlen] = 0;
+            workdir_seek(state_get_focused_frame()->workdir, searchstr);
+        }
         if(state_get_screen_dirty()) screen_update();
-       }
-       free(searchstr);
-       state_set_mode(MODE_NORMAL);
+    }
+    free(searchstr);
+    state_set_mode(MODE_NORMAL);
 }
 
 static binding_t Default_Bindings[] = {

diff --git a/source/screen.c b/source/screen.c
index cf68a14f2c96e7663199a3c1ad1db4e09395795b..f7c789112e42936a0814e05aa29369a6c65f57c1 100644 (file)
--- a/source/screen.c
+++ b/source/screen.c
@@ -135,8 +135,8 @@ static void screen_frame_free(void* p_frame_ptr) {
 }
 
 static void screen_frame_scroll(frame_t* p_frame){
-       int rows,cols;
-       getmaxyx(p_frame->p_win, rows, cols);
+    int rows,cols;
+    getmaxyx(p_frame->p_win, rows, cols);
     if(p_frame->workdir->idx < p_frame->top_index)
         p_frame->top_index = p_frame->workdir->idx;
     else if (p_frame->top_index < p_frame->workdir->idx-(rows-FrameTopBuffer-FrameBotBuffer))
@@ -165,9 +165,9 @@ void screen_frame_draw_files(frame_t* frame){
         mvwaddnstr(frame->p_win, frame_i, 1, file->name, cols-2);
         frame_i++;
         if(file->expanded){
-                       mvwprintw(frame->p_win, frame_i, 1, "    owned by user id %d, group id %d", file->uid, file->gid);
-                       frame_i++;
-               }
+            mvwprintw(frame->p_win, frame_i, 1, "    owned by user id %d, group id %d", file->uid, file->gid);
+            frame_i++;
+        }
         if(frame == state_get_focused_frame() && file_i == frame->workdir->idx){
             wattroff(frame->p_win, A_STANDOUT | A_BOLD);
         }
@@ -178,15 +178,15 @@ void screen_frame_draw_files(frame_t* frame){
 }
 
 int realrows(frame_t* p_frame){
-       int rows, cols;
-       getmaxyx(p_frame->p_win, rows, cols);
-       return rows - FrameTopBuffer - FrameBotBuffer;
+    int rows, cols;
+    getmaxyx(p_frame->p_win, rows, cols);
+    return rows - FrameTopBuffer - FrameBotBuffer;
 }
 void screen_frame_page_up(frame_t* p_frame){
-       workdir_set_idx(p_frame->workdir, p_frame->workdir->idx - realrows(p_frame));
+    workdir_set_idx(p_frame->workdir, p_frame->workdir->idx - realrows(p_frame));
 }
 
 void screen_frame_page_down(frame_t* p_frame){
-       workdir_set_idx(p_frame->workdir, p_frame->workdir->idx+realrows(p_frame));
+    workdir_set_idx(p_frame->workdir, p_frame->workdir->idx+realrows(p_frame));
 }
 

diff --git a/source/screen.h b/source/screen.h
index e1a24d466983a708886e858d4fde41b24656d1ec..ff9a960329e92c7064a47a8d8415521e773f9872 100644 (file)
--- a/source/screen.h
+++ b/source/screen.h
@@ -27,7 +27,7 @@ typedef struct {
 } frame_t;
 
 enum ColorPairs {
-       DIRECTORY = 1
+    DIRECTORY = 1
 };
 
 void screen_frame_page_up(frame_t* p_frame);

diff --git a/source/state.c b/source/state.c
index 5cf276e0fdb691b796248d2c5f84c03bd8f4d66e..20e3f84df1403e34389e653d85f3d55fc633a6b0 100644 (file)
--- a/source/state.c
+++ b/source/state.c
@@ -59,7 +59,7 @@ void state_set_aardvark_mode(bool val)
 }
 
 frame_t* state_get_focused_frame(void) {
-       return Focused_Frame;
+    return Focused_Frame;
 }
 
 void state_set_focused_frame(frame_t *p_frame)
@@ -68,10 +68,10 @@ void state_set_focused_frame(frame_t *p_frame)
 }
 
 Mode_T state_get_mode(){
-       return CurrentMode;
+    return CurrentMode;
 }
 
 void state_set_mode(Mode_T m){
-       CurrentMode = m;
+    CurrentMode = m;
 }
 

diff --git a/source/workdir.c b/source/workdir.c
index a8d37aeda2d1c5d282c11f94b049b89a8f58b54b..3f295c2f860d751715b671990c8c6e47a724cb2f 100644 (file)
--- a/source/workdir.c
+++ b/source/workdir.c
@@ -23,11 +23,11 @@ bool is_dir(char* path) {
 }
 
 void populate_owner_info(File_T* p_file){
-       struct stat s;
-       if(stat(p_file->path, &s) == 0){
-               p_file->uid = s.st_uid;
-               p_file->gid = s.st_gid;
-       } //else error
+    struct stat s;
+    if(stat(p_file->path, &s) == 0){
+        p_file->uid = s.st_uid;
+        p_file->gid = s.st_gid;
+    } //else error
 }
 
 void workdir_free(void* p_wd);
@@ -56,27 +56,27 @@ void file_free(void* p_vfile){
 }
 
 void workdir_set_idx(WorkDir_T* wd, int idx){
-       wd->idx = idx;
-       if(idx < 0) wd->idx = 0;
-       else if(idx >= vec_size(wd->vfiles))
-               wd->idx = vec_size(wd->vfiles)-1;
-       state_set_screen_dirty(true);
+    wd->idx = idx;
+    if(idx < 0) wd->idx = 0;
+    else if(idx >= vec_size(wd->vfiles))
+        wd->idx = vec_size(wd->vfiles)-1;
+    state_set_screen_dirty(true);
 }
 
 void workdir_next(WorkDir_T* wd) {
-       workdir_set_idx(wd, wd->idx+1);
+    workdir_set_idx(wd, wd->idx+1);
 }
 
 void workdir_prev(WorkDir_T* wd) {
-       workdir_set_idx(wd, wd->idx-1);
+    workdir_set_idx(wd, wd->idx-1);
 }
 
 void workdir_scroll_to_top(WorkDir_T* wd){
-       workdir_set_idx(wd, 0);
+    workdir_set_idx(wd, 0);
 }
 
 void workdir_scroll_to_bot(WorkDir_T* wd){
-       workdir_set_idx(wd, vec_size(wd->vfiles) - 1);
+    workdir_set_idx(wd, vec_size(wd->vfiles) - 1);
 }
 
 void workdir_cd(WorkDir_T* wd) {
@@ -148,8 +148,8 @@ void workdir_ls(WorkDir_T* wd){
         }
         strcat(file->path, filename);
         file->name = &(file->path[filename_offset]);
-               populate_owner_info(file);
-               file->expanded = false;
+        populate_owner_info(file);
+        file->expanded = false;
         vec_push_back(wd->vfiles, file);
     }
     free(filename);
@@ -158,18 +158,18 @@ void workdir_ls(WorkDir_T* wd){
 }
 
 void workdir_seek(WorkDir_T* wd, char* search){
-       int i = 0;
-       if(strcmp(((File_T*)vec_at(wd->vfiles, 0))->name, "..") == 0) i++;
-       while(i < vec_size(wd->vfiles) && strcmp(((File_T*)vec_at(wd->vfiles, i))->name, search) < 0) i++;
-       workdir_set_idx(wd, i);
+    int i = 0;
+    if(strcmp(((File_T*)vec_at(wd->vfiles, 0))->name, "..") == 0) i++;
+    while(i < vec_size(wd->vfiles) && strcmp(((File_T*)vec_at(wd->vfiles, i))->name, search) < 0) i++;
+    workdir_set_idx(wd, i);
 }
 
 void workdir_expand_selected(WorkDir_T* wd){
-       ((File_T*)vec_at(wd->vfiles, wd->idx))->expanded = true;
-       state_set_screen_dirty(true);
+    ((File_T*)vec_at(wd->vfiles, wd->idx))->expanded = true;
+    state_set_screen_dirty(true);
 }
 void workdir_collapse_selected(WorkDir_T* wd){
-       ((File_T*)vec_at(wd->vfiles, wd->idx))->expanded = false;
-       state_set_screen_dirty(true);
+    ((File_T*)vec_at(wd->vfiles, wd->idx))->expanded = false;
+    state_set_screen_dirty(true);
 }
 

diff --git a/source/workdir.h b/source/workdir.h
index a88c7bf949502cb123f3ceb75276b3b7ea6b8775..a05da5e43793545d6092e8fc11bd6e06b533209e 100644 (file)
--- a/source/workdir.h
+++ b/source/workdir.h
@@ -19,11 +19,11 @@ typedef struct {
 } WorkDir_T;
 
 typedef struct {
-       char* path;
-       char* name;
-       int uid;
-       int gid;
-       bool expanded;
+    char* path;
+    char* name;
+    int uid;
+    int gid;
+    bool expanded;
 } File_T;
 
 WorkDir_T* workdir_new(char* path);