From 5ebf5b7502535e7270021eefde2c2285cf9adcd5 Mon Sep 17 00:00:00 2001
From: "S. Gilles" <sgilles@math.umd.edu>
Date: Mon, 15 Oct 2018 08:33:18 -0400
Subject: [PATCH] Reformat everything

---
 nci-course-settings.c         |  21 ++++--
 nci-create-assignment-group.c |   3 +-
 nci-create-assignment.c       |   3 +-
 nci-delete-assignment-group.c |   3 +-
 nci-delete-assignment.c       |   3 +-
 nci-edit-assignment-group.c   |  13 ++--
 nci-edit-assignment.c         |   3 +-
 nci-get-assignment-grades.c   |  11 +--
 nci-list-assignments.c        |   9 ++-
 nci-list-courses.c            |   6 +-
 nci-put-assignment-grades.c   |   8 +-
 util.c                        | 166 +++++++++++++++++++++++-------------------
 12 files changed, 142 insertions(+), 107 deletions(-)

diff --git a/nci-course-settings.c b/nci-course-settings.c
index fc72a12..11f7458 100644
--- a/nci-course-settings.c
+++ b/nci-course-settings.c
@@ -30,13 +30,15 @@
 #include "util.h"
 
 /* Generic max */
-static size_t max(size_t a, size_t b)
+static size_t
+max(size_t a, size_t b)
 {
         return (a > b) ? a : b;
 }
 
 /* Compare grading standard entries based on score */
-static int gse_cmp(const void *a, const void *b)
+static int
+gse_cmp(const void *a, const void *b)
 {
         grading_standard_entry *ga = (grading_standard_entry *) a;
         grading_standard_entry *gb = (grading_standard_entry *) b;
@@ -53,8 +55,8 @@ static int gse_cmp(const void *a, const void *b)
 }
 
 /* Cut up str into pairs, filling gse as appropriate */
-static int parse_cutoff_arg(char *str, grading_standard_entry **out,
-                            size_t *out_num)
+static int
+parse_cutoff_arg(char *str, grading_standard_entry **out, size_t *out_num)
 {
         char *p1 = 0;
         char *p2 = 0;
@@ -118,8 +120,9 @@ cleanup:
         return ret;
 }
 
-static int get_and_write_everything(const char *url_base, const
-                                    char *auth_token, char *course_id)
+static int
+get_and_write_everything(const char *url_base, const char *auth_token,
+                         char *course_id)
 {
         int ret = EINVAL;
         size_t len = 0;
@@ -272,7 +275,8 @@ static int get_and_write_everything(const char *url_base, const
                                                                     strlen(
                                                                             sorted_gse
                                                                             [0].
-        name)), "", sorted_gse[0].value);
+                                                                            name)),
+               "", sorted_gse[0].value);
 
         for (j = 1; j < letters_num; ++j) {
                 printf("  %s%*s [%s, %s)\n", sorted_gse[j].name,
@@ -298,7 +302,8 @@ cleanup:
         return ret;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-create-assignment-group.c b/nci-create-assignment-group.c
index 153608f..820ac92 100644
--- a/nci-create-assignment-group.c
+++ b/nci-create-assignment-group.c
@@ -28,7 +28,8 @@
 #include "macros.h"
 #include "util.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-create-assignment.c b/nci-create-assignment.c
index 9914405..bddd9c1 100644
--- a/nci-create-assignment.c
+++ b/nci-create-assignment.c
@@ -28,7 +28,8 @@
 #include "macros.h"
 #include "util.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-delete-assignment-group.c b/nci-delete-assignment-group.c
index 1f7532b..609ff4e 100644
--- a/nci-delete-assignment-group.c
+++ b/nci-delete-assignment-group.c
@@ -29,7 +29,8 @@
 #include "macros.h"
 #include "util.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-delete-assignment.c b/nci-delete-assignment.c
index 53ade37..ccfc151 100644
--- a/nci-delete-assignment.c
+++ b/nci-delete-assignment.c
@@ -29,7 +29,8 @@
 #include "macros.h"
 #include "util.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-edit-assignment-group.c b/nci-edit-assignment-group.c
index fad0463..a15f4f7 100644
--- a/nci-edit-assignment-group.c
+++ b/nci-edit-assignment-group.c
@@ -28,7 +28,8 @@
 #include "macros.h"
 #include "util.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
@@ -165,11 +166,11 @@ int main(int argc, char **argv)
         len = snprintf(0, 0, "%s/api/v1/courses/%s/assignment_groups/%s",
                        url_base, course_id, group_id);
 
-                if (len + 1 < len) {
-                        ret = errno = EOVERFLOW;
-                        perror(L(""));
-                        goto cleanup;
-                }
+        if (len + 1 < len) {
+                ret = errno = EOVERFLOW;
+                perror(L(""));
+                goto cleanup;
+        }
 
         if (!(built_uri = malloc(len + 1))) {
                 ret = errno;
diff --git a/nci-edit-assignment.c b/nci-edit-assignment.c
index 29837f4..c9e3eb7 100644
--- a/nci-edit-assignment.c
+++ b/nci-edit-assignment.c
@@ -28,7 +28,8 @@
 #include "macros.h"
 #include "util.h"
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-get-assignment-grades.c b/nci-get-assignment-grades.c
index 23a8211..5d94fec 100644
--- a/nci-get-assignment-grades.c
+++ b/nci-get-assignment-grades.c
@@ -31,10 +31,10 @@
 #include "util.h"
 
 /* Write output to stdout */
-static void write_out_everything(char *course_id, map *students, map **grades,
-                                 map *totals, map *partials, size_t
-                                 assignments_num, char **assignment_ids,
-                                 map *assignments)
+static void
+write_out_everything(char *course_id, map *students, map **grades, map *totals,
+                     map *partials, size_t assignments_num,
+                     char **assignment_ids, map *assignments)
 {
         size_t j;
         size_t k;
@@ -145,7 +145,8 @@ static void write_out_everything(char *course_id, map *students, map **grades,
         free(student_names);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-list-assignments.c b/nci-list-assignments.c
index 43579ae..2c937b0 100644
--- a/nci-list-assignments.c
+++ b/nci-list-assignments.c
@@ -49,7 +49,8 @@ enum {
         FN_A_END = 6
 };
 
-static int cmp_entry_by_pos(const void *a, const void *b)
+static int
+cmp_entry_by_pos(const void *a, const void *b)
 {
         const entry *ea = (const entry *) a;
         const entry *eb = (const entry *) b;
@@ -61,7 +62,8 @@ static int cmp_entry_by_pos(const void *a, const void *b)
         return (la < lb) ? -1 : ((la > lb) ? 1 : 0);
 }
 
-static int write_out_everything(map *assigns, map *agroups)
+static int
+write_out_everything(map *assigns, map *agroups)
 {
         int ret = EINVAL;
         size_t j = 0;
@@ -189,7 +191,8 @@ cleanup:
         return ret;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-list-courses.c b/nci-list-courses.c
index 3c3f0ba..ad0dba3 100644
--- a/nci-list-courses.c
+++ b/nci-list-courses.c
@@ -27,7 +27,8 @@
 #include "macros.h"
 #include "util.h"
 
-static int list_courses(const char *url_base, const char *auth_token)
+static int
+list_courses(const char *url_base, const char *auth_token)
 {
         size_t j = 0;
         int ret = EINVAL;
@@ -78,7 +79,8 @@ cleanup:
         return ret;
 }
 
-int main(void)
+int
+main(void)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/nci-put-assignment-grades.c b/nci-put-assignment-grades.c
index a8f632b..baf8b69 100644
--- a/nci-put-assignment-grades.c
+++ b/nci-put-assignment-grades.c
@@ -29,8 +29,9 @@
 #include "macros.h"
 #include "util.h"
 
-int prepare_csv_for_upload(char ***csv, size_t rows, size_t cols, long
-                           long **course_ids, long long **assignment_ids)
+int
+prepare_csv_for_upload(char ***csv, size_t rows, size_t cols, long
+                       long **course_ids, long long **assignment_ids)
 {
         size_t j = 0;
         long long course_id = 0;
@@ -140,7 +141,8 @@ int prepare_csv_for_upload(char ***csv, size_t rows, size_t cols, long
         return 0;
 }
 
-int main(void)
+int
+main(void)
 {
         int ret = EINVAL;
         char *url_base = 0;
diff --git a/util.c b/util.c
index 9ce2988..30909f9 100644
--- a/util.c
+++ b/util.c
@@ -45,32 +45,20 @@ typedef enum {
         CPS_END_OF_INPUT
 } csv_parse_state;
 
-static size_t
-curl_to_devnull(char *ptr, size_t size, size_t nmemb, void *ctx);
-static char *
-get_config_file_contents(const char *config_file_name);
-static size_t
-extract_next_link(char *buffer, size_t size, size_t nitems, void *userdata);
-static int
-ie_yc_number(void *ctx, const char *val, size_t len);
-static int
-ie_yc_map_key(void *ctx, const unsigned char *key, size_t len);
-static int
-ie_yc_string(void *ctx, const unsigned char *val, size_t len);
-static int
-kve_yc_boolean(void *ctx, int val);
-static int
-kve_yc_end_map(void *ctx);
-static int
-kve_yc_map_key(void *ctx, const unsigned char *key, size_t len);
-static int
-kve_yc_start_map(void *ctx);
-static int
-kve_yc_string(void *ctx, const unsigned char *val, size_t len);
-static int
-kve_yc_number(void *ctx, const char *nval, size_t len);
-static size_t
-map_hash(const char *s);
+static size_t curl_to_devnull(char *ptr, size_t size, size_t nmemb, void *ctx);
+static char * get_config_file_contents(const char *config_file_name);
+static size_t extract_next_link(char *buffer, size_t size, size_t nitems,
+                                void *userdata);
+static int ie_yc_number(void *ctx, const char *val, size_t len);
+static int ie_yc_map_key(void *ctx, const unsigned char *key, size_t len);
+static int ie_yc_string(void *ctx, const unsigned char *val, size_t len);
+static int kve_yc_boolean(void *ctx, int val);
+static int kve_yc_end_map(void *ctx);
+static int kve_yc_map_key(void *ctx, const unsigned char *key, size_t len);
+static int kve_yc_start_map(void *ctx);
+static int kve_yc_string(void *ctx, const unsigned char *val, size_t len);
+static int kve_yc_number(void *ctx, const char *nval, size_t len);
+static size_t map_hash(const char *s);
 yajl_callbacks ie_callbacks = {
         /* */
         .yajl_number = ie_yc_number,   /* */
@@ -86,7 +74,8 @@ yajl_callbacks kve_callbacks = {
         .yajl_number = kve_yc_number,       /* */
         .yajl_boolean = kve_yc_boolean      /* */
 };
-static CURL * create_curl_handle(void)
+static CURL *
+create_curl_handle(void)
 {
         CURL *c = curl_easy_init();
 
@@ -104,7 +93,8 @@ static CURL * create_curl_handle(void)
         return c;
 }
 
-static size_t curl_to_devnull(char *ptr, size_t size, size_t nmemb, void *ctx)
+static size_t
+curl_to_devnull(char *ptr, size_t size, size_t nmemb, void *ctx)
 {
         UNUSED(ptr);
         UNUSED(size);
@@ -114,7 +104,8 @@ static size_t curl_to_devnull(char *ptr, size_t size, size_t nmemb, void *ctx)
         return size * nmemb;
 }
 
-static size_t curl_to_yajl(char *ptr, size_t size, size_t nmemb, void *ctx)
+static size_t
+curl_to_yajl(char *ptr, size_t size, size_t nmemb, void *ctx)
 {
         size_t total = size * nmemb;
         curl_to_yajl_ctx *c = (curl_to_yajl_ctx *) ctx;
@@ -158,8 +149,8 @@ static size_t curl_to_yajl(char *ptr, size_t size, size_t nmemb, void *ctx)
         return total;
 }
 
-static size_t extract_next_link(char *buffer, size_t size, size_t nitems,
-                                void *userdata)
+static size_t
+extract_next_link(char *buffer, size_t size, size_t nitems, void *userdata)
 {
         size_t total = size * nitems;
         char **storage_location = (char **) userdata;
@@ -185,12 +176,14 @@ static size_t extract_next_link(char *buffer, size_t size, size_t nitems,
         return total;
 }
 
-char * get_auth_token(void)
+char *
+get_auth_token(void)
 {
         return get_config_file_contents("token");
 }
 
-static char * get_config_file_contents(const char *config_file_name)
+static char *
+get_config_file_contents(const char *config_file_name)
 {
         char *xdg_config_home = getenv("XDG_CONFIG_HOME");
         char *home = getenv("HOME");
@@ -303,17 +296,20 @@ cleanup:
         return contents;
 }
 
-char * get_url_base(void)
+char *
+get_url_base(void)
 {
         return get_config_file_contents("site");
 }
 
-static int ie_yc_number(void *ctx, const char *val, size_t len)
+static int
+ie_yc_number(void *ctx, const char *val, size_t len)
 {
         return ie_yc_string(ctx, (const unsigned char *) val, len);
 }
 
-static int ie_yc_map_key(void *ctx, const unsigned char *key, size_t len)
+static int
+ie_yc_map_key(void *ctx, const unsigned char *key, size_t len)
 {
         ie_y_ctx *c = (ie_y_ctx *) ctx;
 
@@ -324,7 +320,8 @@ static int ie_yc_map_key(void *ctx, const unsigned char *key, size_t len)
         return 1;
 }
 
-static int ie_yc_string(void *ctx, const unsigned char *val, size_t len)
+static int
+ie_yc_string(void *ctx, const unsigned char *val, size_t len)
 {
         ie_y_ctx *c = (ie_y_ctx *) ctx;
         char *dup = 0;
@@ -355,8 +352,9 @@ static int ie_yc_string(void *ctx, const unsigned char *val, size_t len)
         return 1;
 }
 
-int key_value_extract(const char *original_path, const char *auth_token, const
-                      char **field_names, char *enclosing_id, map *m)
+int
+key_value_extract(const char *original_path, const char *auth_token, const
+                  char **field_names, char *enclosing_id, map *m)
 {
         int ret = 0;
         CURL *c = 0;
@@ -490,7 +488,8 @@ cleanup:
         return ret;
 }
 
-static int kve_yc_end_map(void *ctx)
+static int
+kve_yc_end_map(void *ctx)
 {
         kve_y_ctx *c = (kve_y_ctx *) ctx;
         int mret = 0;
@@ -518,7 +517,8 @@ static int kve_yc_end_map(void *ctx)
         return mret >= 0;
 }
 
-static int kve_handle(kve_y_ctx *c, const char *s, size_t l)
+static int
+kve_handle(kve_y_ctx *c, const char *s, size_t l)
 {
         int truncated_l = (l > 70) ? 70 : l;
         char *dup;
@@ -592,7 +592,8 @@ static int kve_handle(kve_y_ctx *c, const char *s, size_t l)
         return 0;
 }
 
-static int kve_yc_boolean(void *ctx, int val)
+static int
+kve_yc_boolean(void *ctx, int val)
 {
         if (val) {
                 if (kve_handle((kve_y_ctx *) ctx, "true", 4)) {
@@ -607,7 +608,8 @@ static int kve_yc_boolean(void *ctx, int val)
         return 1;
 }
 
-int kve_yc_map_key(void *ctx, const unsigned char *key, size_t len)
+int
+kve_yc_map_key(void *ctx, const unsigned char *key, size_t len)
 {
         kve_y_ctx *c = (kve_y_ctx *) ctx;
         const char *s = (const char *) key;
@@ -640,7 +642,8 @@ int kve_yc_map_key(void *ctx, const unsigned char *key, size_t len)
         return 1;
 }
 
-static int kve_yc_number(void *ctx, const char *nval, size_t len)
+static int
+kve_yc_number(void *ctx, const char *nval, size_t len)
 {
         if (kve_handle((kve_y_ctx *) ctx, nval, len)) {
                 return 0;
@@ -649,7 +652,8 @@ static int kve_yc_number(void *ctx, const char *nval, size_t len)
         return 1;
 }
 
-static int kve_yc_start_map(void *ctx)
+static int
+kve_yc_start_map(void *ctx)
 {
         kve_y_ctx *c = (kve_y_ctx *) ctx;
 
@@ -658,7 +662,8 @@ static int kve_yc_start_map(void *ctx)
         return 1;
 }
 
-static int kve_yc_string(void *ctx, const unsigned char *val, size_t len)
+static int
+kve_yc_string(void *ctx, const unsigned char *val, size_t len)
 {
         kve_y_ctx *c = (kve_y_ctx *) ctx;
         const char *s = (const char *) val;
@@ -670,8 +675,9 @@ static int kve_yc_string(void *ctx, const unsigned char *val, size_t len)
         return 1;
 }
 
-int make_gse_post(grading_standard_entry *cutoffs, size_t cutoffs_num, struct
-                  curl_httppost **out_post)
+int
+make_gse_post(grading_standard_entry *cutoffs, size_t cutoffs_num, struct
+              curl_httppost **out_post)
 {
         struct curl_httppost *post = 0;
         struct curl_httppost *postend = 0;
@@ -722,10 +728,11 @@ cleanup:
         return ret;
 }
 
-int make_course_post(const char *hfg, const char *aagw, int
-                     disable_grading_standard, const char *start_date, const
-                     char *end_date, const
-                     char *gse_id, struct curl_httppost **out_post)
+int
+make_course_post(const char *hfg, const char *aagw, int
+                 disable_grading_standard, const char *start_date, const
+                 char *end_date, const
+                 char *gse_id, struct curl_httppost **out_post)
 {
         struct curl_httppost *post = 0;
         struct curl_httppost *postend = 0;
@@ -816,9 +823,9 @@ cleanup:
         return ret;
 }
 
-struct curl_httppost * make_agroup_post(const char *name, const char *weight,
-                                        const char *drop_lowest, const
-                                        char *drop_highest)
+struct curl_httppost *
+make_agroup_post(const char *name, const char *weight, const char *drop_lowest,
+                 const char *drop_highest)
 {
         struct curl_httppost *post = 0;
         struct curl_httppost *postend = 0;
@@ -871,10 +878,9 @@ error:
         return 0;
 }
 
-struct curl_httppost * make_assignment_post(const char *name, const
-                                            char *max_points, const
-                                            char *due_date, const
-                                            char *group_id)
+struct curl_httppost *
+make_assignment_post(const char *name, const char *max_points, const
+                     char *due_date, const char *group_id)
 {
         struct curl_httppost *post = 0;
         struct curl_httppost *postend = 0;
@@ -964,8 +970,8 @@ error:
         return 0;
 }
 
-struct curl_httppost * make_update_grade_post(char ***csv, size_t col, size_t
-                                              rows)
+struct curl_httppost *
+make_update_grade_post(char ***csv, size_t col, size_t rows)
 {
         struct curl_httppost *post = 0;
         struct curl_httppost *postend = 0;
@@ -1058,7 +1064,8 @@ done:
         return post;
 }
 
-int map_add(map *m, char *k, char **vs)
+int
+map_add(map *m, char *k, char **vs)
 {
         size_t j = 0;
         size_t l = 0;
@@ -1115,7 +1122,8 @@ malloc_err:
         return -1;
 }
 
-void map_clean(map *m)
+void
+map_clean(map *m)
 {
         size_t j = 0;
         size_t k = 0;
@@ -1146,7 +1154,8 @@ void map_clean(map *m)
         *m = (map) { 0 };
 }
 
-static int map_cmp_key(const void *a, const void *b)
+static int
+map_cmp_key(const void *a, const void *b)
 {
         const char *s = *((const char **) a);
         const char *t = *((const char **) b);
@@ -1156,7 +1165,8 @@ static int map_cmp_key(const void *a, const void *b)
         return (m < n) ? -1 : ((m > n) ? 1 : strcmp(s, t));
 }
 
-char ** map_get(map *m, char *k)
+char **
+map_get(map *m, char *k)
 {
         size_t j = 0;
         entry *e = 0;
@@ -1178,7 +1188,8 @@ char ** map_get(map *m, char *k)
         return 0;
 }
 
-void map_get_keys(map *m, char ***out_k, size_t *out_num)
+void
+map_get_keys(map *m, char ***out_k, size_t *out_num)
 {
         size_t num_keys = 0;
         size_t j = 0;
@@ -1205,7 +1216,8 @@ void map_get_keys(map *m, char ***out_k, size_t *out_num)
         *out_num = num_keys;
 }
 
-static size_t map_hash(const char *s)
+static size_t
+map_hash(const char *s)
 {
         const char *p = 0;
         uint_fast8_t j;
@@ -1223,7 +1235,8 @@ static size_t map_hash(const char *s)
         return hash % BUCKET_NUM;
 }
 
-void print_esc_0x22(const char *s)
+void
+print_esc_0x22(const char *s)
 {
         const char *p = s;
 
@@ -1240,10 +1253,11 @@ void print_esc_0x22(const char *s)
         }
 }
 
-static int process_char_csv(int c, csv_parse_state *s, char **cell,
-                            size_t *cell_sz, size_t *cell_pos, char ****csv,
-                            char *reading_header,
-                            size_t *record_len, size_t *y, size_t *x)
+static int
+process_char_csv(int c, csv_parse_state *s, char **cell, size_t *cell_sz,
+                 size_t *cell_pos, char ****csv, char *reading_header,
+                 size_t *record_len,
+                 size_t *y, size_t *x)
 {
         void *newmem;
 
@@ -1442,7 +1456,8 @@ static int process_char_csv(int c, csv_parse_state *s, char **cell,
         return 0;
 }
 
-int read_csv(FILE *f, char ****out_csv, size_t *out_rows, size_t *out_cols)
+int
+read_csv(FILE *f, char ****out_csv, size_t *out_rows, size_t *out_cols)
 {
         size_t fread_ret = 0;
         csv_parse_state s = CPS_START_OF_CELL;
@@ -1527,8 +1542,9 @@ error:
         return -1;
 }
 
-int send_and_id_scan(const char *uri, const char *auth_token, struct
-                     curl_httppost *post, const char *method, char **id)
+int
+send_and_id_scan(const char *uri, const char *auth_token, struct
+                 curl_httppost *post, const char *method, char **id)
 {
         int ret = 0;
         CURL *c = 0;
-- 
2.11.4.GIT