UPDATED: Update astyle formatting

src/argtable3.c

@@ -118,7 +118,7 @@ extern void * xrealloc(void * ptr, size_t size);
 extern void xfree(void * ptr);
 
 struct arg_hashtable_entry {
- void * k, *v;
+ void * k, * v;
  unsigned int h;
  struct arg_hashtable_entry * next;
 };
@@ -708,7 +708,7 @@ void arg_hashtable_remove(arg_hashtable_t * h, const void * k) {
 
 void arg_hashtable_destroy(arg_hashtable_t * h, int free_values) {
  unsigned int i;
- struct arg_hashtable_entry * e, *f;
+ struct arg_hashtable_entry * e, * f;
  struct arg_hashtable_entry ** table = h->table;
 
  if (free_values) {
@@ -1577,7 +1577,7 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
 static int
 parse_long_options(char * const * nargv, const char * options,
  const struct option * long_options, int * idx, int short_too, int flags) {
- char * current_argv, *has_equal;
+ char * current_argv, * has_equal;
 #ifdef GNU_COMPATIBLE
  char * current_dash;
 #endif
@@ -3102,7 +3102,7 @@ static void arg_file_resetfn(struct arg_file * parent) {
 
 /* Returns ptr to the base filename within *filename */
 static const char * arg_basename(const char * filename) {
- const char * result = NULL, *result1, *result2;
+ const char * result = NULL, * result1, * result2;
 
  /* Find the last occurrence of eother file separator character. */
  /* Two alternative file separator chars are supported as legal */
@@ -4616,7 +4616,7 @@ static const TRexChar * trex_matchnode(TRex * exp, TRexNode * node, const TRexCh
  /* TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL; */
  TRexNode * greedystop = NULL;
  int p0 = (node->right >> 16) & 0x0000FFFF, p1 = node->right & 0x0000FFFF, nmaches = 0;
- const TRexChar * s = str, *good = str;
+ const TRexChar * s = str, * good = str;
 
  if (node->next != -1) {
  greedystop = &exp->_nodes[node->next];
@@ -6163,7 +6163,7 @@ void arg_print_syntax_ds(arg_dstr_t ds, void ** argtable, const char * suffix) {
  /* print remaining options in abbreviated style */
  for (tabindex = 0; table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
  char syntax[200] = "";
- const char * shortopts, *longopts, *datatype;
+ const char * shortopts, * longopts, * datatype;
 
  /* skip short options without arg values (they were printed by arg_print_gnu_switch) */
  if (table[tabindex]->shortopts && !(table[tabindex]->flag & ARG_HASVALUE)) {
@@ -6230,7 +6230,7 @@ void arg_print_syntaxv_ds(arg_dstr_t ds, void ** argtable, const char * suffix)
  /* print remaining options in abbreviated style */
  for (tabindex = 0; table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
  char syntax[200] = "";
- const char * shortopts, *longopts, *datatype;
+ const char * shortopts, * longopts, * datatype;
 
  shortopts = table[tabindex]->shortopts;
  longopts = table[tabindex]->longopts;

src/epub.c

@@ -69,7 +69,7 @@
  #elif TARGET_OS_MAC
  // Other kinds of Mac OS
  #else
- # error "Unknown Apple platform"
+ #error "Unknown Apple platform"
  #endif
 #endif
 

src/main.c

@@ -74,13 +74,13 @@
 #define kBUFFERSIZE 4096 // How many bytes to read at a time
 
 // argtable structs
-struct arg_lit * a_help, *a_version, *a_compatibility, *a_nolabels, *a_batch,
- *a_accept, *a_reject, *a_full, *a_snippet, *a_random, *a_unique, *a_meta,
- *a_notransclude, *a_nosmart, *a_opml, *a_itmz;
-struct arg_str * a_format, *a_lang, *a_extract;
-struct arg_file * a_file, *a_o;
+struct arg_lit * a_help, * a_version, * a_compatibility, * a_nolabels, * a_batch,
+ * a_accept, * a_reject, * a_full, * a_snippet, * a_random, * a_unique, * a_meta,
+ * a_notransclude, * a_nosmart, * a_opml, * a_itmz;
+struct arg_str * a_format, * a_lang, * a_extract;
+struct arg_file * a_file, * a_o;
 struct arg_end * a_end;
-struct arg_rem * a_rem1, *a_rem2, *a_rem3, *a_rem4, *a_rem5, *a_rem6;
+struct arg_rem * a_rem1, * a_rem2, * a_rem3, * a_rem4, * a_rem5, * a_rem6;
 
 
 /// strdup() not available on all platforms

src/miniz.c

@@ -730,7 +730,7 @@ typedef struct {
 } tdefl_sym_freq;
 static tdefl_sym_freq * tdefl_radix_sort_syms(mz_uint num_syms, tdefl_sym_freq * pSyms0, tdefl_sym_freq * pSyms1) {
  mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2];
- tdefl_sym_freq * pCur_syms = pSyms0, *pNew_syms = pSyms1;
+ tdefl_sym_freq * pCur_syms = pSyms0, * pNew_syms = pSyms1;
  MZ_CLEAR_OBJ(hist);
 
  for (i = 0; i < num_syms; i++) {
@@ -869,7 +869,7 @@ static void tdefl_optimize_huffman_table(tdefl_compressor * d, int table_num, in
  num_codes[d->m_huff_code_sizes[table_num][i]]++;
  }
  } else {
- tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], *pSyms;
+ tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], * pSyms;
  int num_used_syms = 0;
  const mz_uint16 * pSym_count = &d->m_huff_count[table_num][0];
 
@@ -1391,7 +1391,7 @@ static inline mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16 * p) {
 static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor * d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint * pMatch_dist, mz_uint * pMatch_len) {
  mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
  mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
- const mz_uint16 * s = (const mz_uint16 *)(d->m_dict + pos), *p, *q;
+ const mz_uint16 * s = (const mz_uint16 *)(d->m_dict + pos), * p, * q;
  mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD2(s);
  MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
 
@@ -1453,7 +1453,7 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor * d, mz_uint lookah
 static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor * d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint * pMatch_dist, mz_uint * pMatch_len) {
  mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
  mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
- const mz_uint8 * s = d->m_dict + pos, *p, *q;
+ const mz_uint8 * s = d->m_dict + pos, * p, * q;
  mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1];
  MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
 
@@ -1509,7 +1509,7 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor * d, mz_uint lookah
 static mz_bool tdefl_compress_fast(tdefl_compressor * d) {
  /* Faster, minimally featured LZRW1-style match+parse loop with better register utilization. Intended for applications where raw throughput is valued more highly than ratio. */
  mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left;
- mz_uint8 * pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags;
+ mz_uint8 * pLZ_code_buf = d->m_pLZ_code_buf, * pLZ_flags = d->m_pLZ_flags;
  mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
 
  while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size))) {
@@ -2433,8 +2433,8 @@ tinfl_status tinfl_decompress(tinfl_decompressor * r, const mz_uint8 * pIn_buf_n
  tinfl_status status = TINFL_STATUS_FAILED;
  mz_uint32 num_bits, dist, counter, num_extra;
  tinfl_bit_buf_t bit_buf;
- const mz_uint8 * pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
- mz_uint8 * pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size;
+ const mz_uint8 * pIn_buf_cur = pIn_buf_next, * const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
+ mz_uint8 * pOut_buf_cur = pOut_buf_next, * const pOut_buf_end = pOut_buf_next + *pOut_buf_size;
  size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t) -1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start;
 
  /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */
@@ -2933,7 +2933,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor * r, const mz_uint8 * pIn_buf_n
 /* Higher level helper functions. */
 void * tinfl_decompress_mem_to_heap(const void * pSrc_buf, size_t src_buf_len, size_t * pOut_len, int flags) {
  tinfl_decompressor decomp;
- void * pBuf = NULL, *pNew_buf;
+ void * pBuf = NULL, * pNew_buf;
  size_t src_buf_ofs = 0, out_buf_capacity = 0;
  *pOut_len = 0;
  tinfl_init(&decomp);
@@ -3510,7 +3510,7 @@ static mz_bool mz_zip_reader_init_internal(mz_zip_archive * pZip, mz_uint flags)
 }
 
 static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array * pCentral_dir_array, const mz_zip_array * pCentral_dir_offsets, mz_uint l_index, mz_uint r_index) {
- const mz_uint8 * pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
+ const mz_uint8 * pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), * pE;
  const mz_uint8 * pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index));
  mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS);
  mz_uint8 l = 0, r = 0;
@@ -4346,7 +4346,7 @@ static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char * pA, const char *
 }
 
 static MZ_FORCEINLINE int mz_zip_filename_compare(const mz_zip_array * pCentral_dir_array, const mz_zip_array * pCentral_dir_offsets, mz_uint l_index, const char * pR, mz_uint r_len) {
- const mz_uint8 * pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
+ const mz_uint8 * pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), * pE;
  mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS);
  mz_uint8 l = 0, r = 0;
  pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;

src/miniz.h

@@ -682,13 +682,13 @@ typedef struct {
  mz_uint m_flags, m_max_probes[2];
  int m_greedy_parsing;
  mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size;
- mz_uint8 * m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end;
+ mz_uint8 * m_pLZ_code_buf, * m_pLZ_flags, * m_pOutput_buf, * m_pOutput_buf_end;
  mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer;
  mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish;
  tdefl_status m_prev_return_status;
  const void * m_pIn_buf;
  void * m_pOut_buf;
- size_t * m_pIn_buf_size, *m_pOut_buf_size;
+ size_t * m_pIn_buf_size, * m_pOut_buf_size;
  tdefl_flush m_flush;
  const mz_uint8 * m_pSrc;
  size_t m_src_buf_left, m_out_buf_ofs;

src/opendocument.c

@@ -112,7 +112,7 @@
  #elif TARGET_OS_MAC
  // Other kinds of Mac OS
  #else
- # error "Unknown Apple platform"
+ #error "Unknown Apple platform"
  #endif
 #endif
 

src/textbundle.c

@@ -116,7 +116,7 @@
  #elif TARGET_OS_MAC
  // Other kinds of Mac OS
  #else
- # error "Unknown Apple platform"
+ #error "Unknown Apple platform"
  #endif
 #endif