You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2006/11/04 20:28:56 UTC

svn commit: r471249 - in /lucene/lucy/trunk/charmonizer/src/Charmonizer/Core: Compiler.harm CompilerSpec.harm HeadCheck.charm HeadCheck.harm ModHandler.charm ModHandler.harm OperSys.charm OperSys.harm Stat.harm Util.charm Util.harm

Author: marvin
Date: Sat Nov  4 11:28:54 2006
New Revision: 471249

URL: http://svn.apache.org/viewvc?view=rev&rev=471249
Log:
No structural changes.  Add comments, correct typose, manipulate whitespace.

Modified:
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm Sat Nov  4 11:28:54 2006
@@ -60,12 +60,12 @@
             const char *cc_flags);
 
 #ifdef CHAZ_USE_SHORT_NAMES
-# define Compiler                    chaz_Compiler
-# define CC_compile_exe_t            chaz_CC_compile_exe_t
-# define CC_compile_obj_t            chaz_CC_compile_obj_t
-# define CC_add_inc_dir_t            chaz_CC_add_inc_dir_t
-# define CC_destroy_t                chaz_CC_destroy_t
-# define CC_new                      chaz_CC_new
+  #define Compiler                    chaz_Compiler
+  #define CC_compile_exe_t            chaz_CC_compile_exe_t
+  #define CC_compile_obj_t            chaz_CC_compile_obj_t
+  #define CC_add_inc_dir_t            chaz_CC_add_inc_dir_t
+  #define CC_destroy_t                chaz_CC_destroy_t
+  #define CC_new                      chaz_CC_new
 #endif
 
 #endif /* H_CHAZ_COMPILER */

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm Sat Nov  4 11:28:54 2006
@@ -16,12 +16,14 @@
     char *exe_flag;
 };
 
+/* Detect a supported compiler and return its profile.
+ */
 chaz_CompilerSpec*
 chaz_CCSpec_find_spec();
 
 #ifdef CHAZ_USE_SHORT_NAMES
-# define CompilerSpec                chaz_CompilerSpec
-# define CCSpec_find_spec            chaz_CCSpec_find_spec
+  #define CompilerSpec                chaz_CompilerSpec
+  #define CCSpec_find_spec            chaz_CCSpec_find_spec
 #endif
 
 #endif /* H_CHAZ_COMPILER_SPEC */

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm Sat Nov  4 11:28:54 2006
@@ -65,7 +65,7 @@
     Header  key;
     Header *fake = &key;
 
-    /* fake up a key to feed to bsearch and see if the header's already there */
+    /* fake up a key to feed to bsearch; see if the header's already there */
     key.name = (char*)header_name;
     key.exists = false;
     header = bsearch(&fake, header_cache, cache_size, sizeof(void*),
@@ -86,7 +86,7 @@
     chaz_bool_t success;
     int i;
 
-    /* build the source code */
+    /* build the source code string */
     code_buf_len = join_strings(&code_buf, code_buf_len, " ", NULL);
     for (i = 0; header_names[i] != NULL; i++) {
         code_buf_len = append_strings(&code_buf, code_buf_len, "#include <", 
@@ -110,8 +110,7 @@
     Header **const a = (Header**)vptr_a;
     Header **const b = (Header**)vptr_b;
 
-    /* null is last, so it's "greater than" any string */
-    if ((*a)->name == NULL)
+    if ((*a)->name == NULL) /* null is "greater than" any string */
         return 1;
     else if ((*b)->name == NULL)
         return -1;
@@ -123,6 +122,7 @@
 discover_header(const char *header_name) {
     Header* header = (Header*)malloc(sizeof(Header));
     
+    /* assign */
     header->name = strdup(header_name);
 
     /* see whether code that tries to pull in this header compiles */

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm Sat Nov  4 11:28:54 2006
@@ -17,18 +17,17 @@
 chaz_bool_t
 chaz_HeadCheck_check_header(const char *header_name);
 
-/* Attempt to compile a file which pulls in all the headers supplied.  If the
- * compile succeeds, add them all to the internal register and return true.
- * 
- * The array of header names must be null-terminated.
+/* Attempt to compile a file which pulls in all the headers specified by name
+ * in a null-terminated array.  If the compile succeeds, add them all to the
+ * internal register and return true.
  */
 chaz_bool_t
 chaz_HeadCheck_check_many_headers(const char **header_names);
 
 #ifdef CHAZ_USE_SHORT_NAMES
-# define HeadCheck_init             chaz_HeadCheck_init
-# define check_header               chaz_HeadCheck_check_header
-# define check_many_headers         chaz_HeadCheck_check_many_headers
+  #define HeadCheck_init             chaz_HeadCheck_init
+  #define check_header               chaz_HeadCheck_check_header
+  #define check_many_headers         chaz_HeadCheck_check_many_headers
 #endif
 
 #endif /* H_CHAZ_HEAD_CHECK */

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm Sat Nov  4 11:28:54 2006
@@ -26,6 +26,7 @@
 static void
 clean_up_try();
 
+/* global vars */
 struct chaz_OperSys  *chaz_ModHand_os = NULL;
 struct chaz_Compiler *chaz_ModHand_compiler = NULL;
 chaz_bool_t chaz_ModHand_charm_run_available = false;
@@ -38,7 +39,7 @@
 
 chaz_bool_t want_short_names = false;
 
-
+/* static vars */
 static char *try_app_path = NULL;
 static char *try_app_command = NULL;
 
@@ -65,7 +66,7 @@
     if (charmony_fh == NULL) 
         die("Can't open 'charmony.h': %s", strerror(errno));
 
-    /* print supplied text (if any), then open include guard */
+    /* print supplied text (if any) along with warning, open include guard */
     if (charmony_start != NULL)
         fprintf(charmony_fh, charmony_start);
     fprintf(charmony_fh,
@@ -199,11 +200,10 @@
     if ( !remove_and_verify(TARGET_PATH) )
         die("Failed to delete file '%s'", TARGET_PATH);
 
+    /* attempt compilation; if successful, run app and slurp output */
     compile_succeeded = compiler->compile_exe(compiler, TRY_SOURCE_PATH, 
         TRY_APP_BASENAME, source, source_len);
-
     if (compile_succeeded) {
-        /* run the app, slurp the output */
         system(try_app_command);
         captured_output = slurp_file(TARGET_PATH, output_len);
     }
@@ -211,6 +211,7 @@
         *output_len = 0;
     }
 
+    /* remove all the files we just created */
     clean_up_try();
 
     return captured_output;

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm Sat Nov  4 11:28:54 2006
@@ -1,4 +1,5 @@
-/* Chaz/Core/ModHandler.h -- symbols used by modules in the Charmonizer core distro.
+/* Chaz/Core/ModHandler.h -- symbols used by modules in the Charmonizer 
+ * core distro.
  */
 
 #ifndef H_CHAZ_MOD_HAND
@@ -57,14 +58,13 @@
 /* Attempt to compile the supplied source code.  If successful, capture the 
  * output of the program and return a pointer to a newly allocated buffer.
  * If the compilation fails, return NULL.  The length of the captured 
- * output will be placed into the buffer pointed to by [output_len].
+ * output will be placed into the integer pointed to by [output_len].
  */
 char*
 chaz_ModHand_capture_output(char *source, size_t source_len, 
                             size_t *output_len);
 
-
-/* Print output to the user-supplied filehandle.
+/* Print output to charmony.h.
  */
 void
 chaz_ModHand_append_conf(char *fmt, ...);
@@ -85,17 +85,17 @@
 void
 chaz_ModHand_shorten_constant(const char *symbol);
 
-/* Define a shortened version of a macro symbol (minuse the prefix);
+/* Define a shortened version of a macro symbol (minus the prefix);
  */
 void
 chaz_ModHand_shorten_macro(const char *symbol);
 
-/* Define a shortened version of a typedef symbol (minuse the prefix);
+/* Define a shortened version of a typedef symbol (minus the prefix);
  */
 void
 chaz_ModHand_shorten_typedef(const char *symbol);
 
-/* Define a shortened version of a function symbol (minuse the prefix);
+/* Define a shortened version of a function symbol (minus the prefix);
  */
 void
 chaz_ModHand_shorten_function(const char *symbol);
@@ -114,38 +114,38 @@
 #define CHAZ_MODHAND_END_RUN append_conf("\n")
 
 
-#ifdef CHAZ_USE_SHORT_NAMES
-# define TRY_SOURCE_PATH        CHAZ_MOD_HAND_TRY_SOURCE_PATH
-# define TRY_APP_BASENAME       CHAZ_MOD_HAND_TRY_APP_BASENAME
-# define TARGET_PATH            CHAZ_MOD_HAND_TARGET_PATH
-# define os                     chaz_ModHand_os
-# define compiler               chaz_ModHand_compiler
-# define charm_run_available    chaz_ModHand_charm_run_available
-# define charmony_fh            chaz_ModHand_charmony_fh
-# define constant_prefix        chaz_ModHand_constant_prefix
-# define macro_prefix           chaz_ModHand_macro_prefix
-# define typedef_prefix         chaz_ModHand_typedef_prefix
-# define function_prefix        chaz_ModHand_function_prefix
-# define want_short_names       chaz_ModHand_want_short_names
-# define ModHand_init           chaz_ModHand_init
-# define ModHand_open_charmony_h  chaz_ModHand_open_charmony_h
-# define ModHand_clean_up       chaz_ModHand_clean_up
-# define write_charm_h          chaz_ModHand_write_charm_h
-# define build_charm_run        chaz_ModHand_build_charm_run
-# define START_SHORT_NAMES      CHAZ_MODHAND_START_SHORT_NAMES
-# define END_SHORT_NAMES        CHAZ_MODHAND_END_SHORT_NAMES
-# define test_compile           chaz_ModHand_test_compile
-# define capture_output         chaz_ModHand_capture_output 
-# define append_conf            chaz_ModHand_append_conf
-# define shorten_constant       chaz_ModHand_shorten_constant
-# define shorten_macro          chaz_ModHand_shorten_macro
-# define shorten_typedef        chaz_ModHand_shorten_typedef
-# define shorten_function       chaz_ModHand_shorten_function
-# define START_RUN              CHAZ_MODHAND_START_RUN
-# define END_RUN                CHAZ_MODHAND_END_RUN
+#ifdef   CHAZ_USE_SHORT_NAMES
+  #define TRY_SOURCE_PATH          CHAZ_MOD_HAND_TRY_SOURCE_PATH
+  #define TRY_APP_BASENAME         CHAZ_MOD_HAND_TRY_APP_BASENAME
+  #define TARGET_PATH              CHAZ_MOD_HAND_TARGET_PATH
+  #define os                       chaz_ModHand_os
+  #define compiler                 chaz_ModHand_compiler
+  #define charm_run_available      chaz_ModHand_charm_run_available
+  #define charmony_fh              chaz_ModHand_charmony_fh
+  #define constant_prefix          chaz_ModHand_constant_prefix
+  #define macro_prefix             chaz_ModHand_macro_prefix
+  #define typedef_prefix           chaz_ModHand_typedef_prefix
+  #define function_prefix          chaz_ModHand_function_prefix
+  #define want_short_names         chaz_ModHand_want_short_names
+  #define ModHand_init             chaz_ModHand_init
+  #define ModHand_open_charmony_h  chaz_ModHand_open_charmony_h
+  #define ModHand_clean_up         chaz_ModHand_clean_up
+  #define write_charm_h            chaz_ModHand_write_charm_h
+  #define build_charm_run          chaz_ModHand_build_charm_run
+  #define START_SHORT_NAMES        CHAZ_MODHAND_START_SHORT_NAMES
+  #define END_SHORT_NAMES          CHAZ_MODHAND_END_SHORT_NAMES
+  #define test_compile             chaz_ModHand_test_compile
+  #define capture_output           chaz_ModHand_capture_output 
+  #define append_conf              chaz_ModHand_append_conf
+  #define shorten_constant         chaz_ModHand_shorten_constant
+  #define shorten_macro            chaz_ModHand_shorten_macro
+  #define shorten_typedef          chaz_ModHand_shorten_typedef
+  #define shorten_function         chaz_ModHand_shorten_function
+  #define START_RUN                CHAZ_MODHAND_START_RUN
+  #define END_RUN                  CHAZ_MODHAND_END_RUN
 #endif
 
-#endif /* H_CHAZ_CORE */
+#endif /* H_CHAZ_MOD_HAND */
 
 /**
  * Copyright 2006 The Apache Software Foundation

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm Sat Nov  4 11:28:54 2006
@@ -30,7 +30,10 @@
     if (verbosity)
         printf("Creating os object...\n");
 
+    /* assign */
     self->name = strdup(name);
+
+    /* init */
     self->buf        = NULL;
     self->buf_len    = 0;
     self->remove_obj = remove_obj;
@@ -38,6 +41,7 @@
     self->run_local  = run_local;
     self->destroy    = destroy;
 
+    /* derive */
     if (strcmp(name, "mswin32") == 0) {
         self->obj_ext = strdup(".obj");
         self->exe_ext = strdup(".exe");
@@ -67,6 +71,7 @@
     if (verbosity)
         printf("Trying to find a bit-bucket a la /dev/null...\n");
 
+    /* iterate through names of possible devnulls trying to open them */
     for (i = 0; devnull_options[i] != NULL; i++) {
         if (can_open_file(devnull_options[i])) {
             self->devnull = strdup(devnull_options[i]);
@@ -74,6 +79,7 @@
         }
     }
 
+    /* bail out we couldn't find a devnull */
     die("Couldn't find anything like /dev/null");
 }
 
@@ -110,13 +116,16 @@
 {
     va_list args;
 
+    /* start with "./", ".\", or whatever */
     self->buf_len = join_strings(&(self->buf), self->buf_len,
         self->local_command_start, NULL);
 
+    /* append all supplied texts */ 
     va_start(args, self);
     self->buf_len = vappend_strings(&(self->buf), self->buf_len, args);
     va_end(args);
 
+    /* run the command */
     system(self->buf);
 }
 

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm Sat Nov  4 11:28:54 2006
@@ -50,12 +50,12 @@
 chaz_OS_new(const char *name);
 
 #ifdef CHAZ_USE_SHORT_NAMES
-# define OperSys                      chaz_OperSys
-# define OS_remove_exe_t              chaz_OS_remove_exe_t
-# define OS_remove_obj_t              chaz_OS_remove_obj_t
-# define OS_run_local_t               chaz_OS_run_local_t
-# define OS_destroy_t                 chaz_OS_destroy_t
-# define OS_new                       chaz_OS_new
+  #define OperSys                      chaz_OperSys
+  #define OS_remove_exe_t              chaz_OS_remove_exe_t
+  #define OS_remove_obj_t              chaz_OS_remove_obj_t
+  #define OS_run_local_t               chaz_OS_run_local_t
+  #define OS_destroy_t                 chaz_OS_destroy_t
+  #define OS_new                       chaz_OS_new
 #endif
 
 #endif /* H_CHAZ_COMPILER */

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm Sat Nov  4 11:28:54 2006
@@ -23,12 +23,16 @@
     long blocks;
 };
 
+/* Attempt to stat a file.  If successful, store the set target->valid to true
+ * and store the results in the stat structure.  If unsuccessful, set
+ * target->valid to false.
+ */
 void
 chaz_Stat_stat(const char *filepath, chaz_Stat *target);
 
 #ifdef CHAZ_USE_SHORT_NAMES
-# define Stat                  chaz_Stat
-# define Stat_stat             chaz_Stat_stat
+  #define Stat                  chaz_Stat
+  #define Stat_stat             chaz_Stat_stat
 #endif
 
 #endif /* H_CHAZ_COMPILER */

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm Sat Nov  4 11:28:54 2006
@@ -6,6 +6,7 @@
 #include <string.h>
 #include "Charmonizer/Core/Util.h"
 
+/* global verbosity setting */
 int chaz_Util_verbosity = 1;
 
 void
@@ -134,6 +135,7 @@
 size_t
 chaz_Util_grow_buf(char **buf, size_t old_len, size_t new_len)
 {
+    /* grow buffer only if necessary */
     if (new_len > 0 && new_len >= old_len) {
         *buf = realloc(*buf, new_len + 1);
         if (*buf == NULL) 
@@ -141,6 +143,7 @@
         *((*buf) + new_len) = '\0';
     }
 
+    /* return whatever the buffer size is now */
     return new_len > old_len ? new_len : old_len;
 }
 
@@ -150,6 +153,7 @@
     va_list args;
     size_t retval;
 
+    /* delegate to vappend_strings */
     va_start(args, buf_len);
     retval = vappend_strings(buf, buf_len, args);
     va_end(args);
@@ -189,6 +193,7 @@
     va_list args;
     size_t retval;
 
+    /* delegate to vjoin_strings */
     va_start(args, buf_len);
     retval = vjoin_strings(buf, buf_len, args);
     va_end(args);
@@ -199,6 +204,7 @@
 size_t
 chaz_Util_vjoin_strings(char **buf, size_t buf_len, va_list args)
 {
+    /* start with en empty string for vappend to append to */
     if (*buf != NULL)
         (*buf)[0] = '\0';
 

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm?view=diff&rev=471249&r1=471248&r2=471249
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm Sat Nov  4 11:28:54 2006
@@ -58,19 +58,19 @@
 chaz_Util_grow_buf(char **buf_ptr, size_t old_len, size_t new_len);
 
 /* Concatenate each string in a null-terminated list onto the end of [buf].
- * Grow [buf] first if necessary and return its size.
+ * Grow [buf] if necessary and return its size.
  */
 size_t
 chaz_Util_append_strings(char **buf, size_t buf_len, ...);
 
-/* Varargs version of append_str
+/* Varargs version of append_str.
  */
 size_t
 chaz_Util_vappend_strings(char **buf, size_t buf_len, va_list args);
 
 /* Replace the contents of [buf] (if any) with a string formed by
  * concatenating all the char* arguments in a null-terminated list.
- * Grow [buf] first if necessary and return its size.
+ * Grow [buf] if necessary and return its size.
  */
 size_t
 chaz_Util_join_strings(char **buf, size_t buf_len, ...);
@@ -81,19 +81,19 @@
 chaz_Util_vjoin_strings(char **buf, size_t buf_len, va_list args);
 
 #ifdef CHAZ_USE_SHORT_NAMES
-# define verbosity              chaz_Util_verbosity 
-# define write_file             chaz_Util_write_file 
-# define slurp_file             chaz_Util_slurp_file 
-# define flength                chaz_Util_flength 
-# define die                    chaz_Util_die 
-# define warn                   chaz_Util_warn 
-# define remove_and_verify      chaz_Util_remove_and_verify 
-# define can_open_file          chaz_Util_can_open_file 
-# define grow_buf               chaz_Util_grow_buf
-# define append_strings         chaz_Util_append_strings
-# define vappend_strings        chaz_Util_vappend_strings
-# define join_strings           chaz_Util_join_strings
-# define vjoin_strings          chaz_Util_vjoin_strings
+  #define verbosity              chaz_Util_verbosity 
+  #define write_file             chaz_Util_write_file 
+  #define slurp_file             chaz_Util_slurp_file 
+  #define flength                chaz_Util_flength 
+  #define die                    chaz_Util_die 
+  #define warn                   chaz_Util_warn 
+  #define remove_and_verify      chaz_Util_remove_and_verify 
+  #define can_open_file          chaz_Util_can_open_file 
+  #define grow_buf               chaz_Util_grow_buf
+  #define append_strings         chaz_Util_append_strings
+  #define vappend_strings        chaz_Util_vappend_strings
+  #define join_strings           chaz_Util_join_strings
+  #define vjoin_strings          chaz_Util_vjoin_strings
 #endif
 
 #endif /* H_CHAZ_UTIL */