extern int fmt_norm;
-/*
- * Hash function for component name. The function should be
- * case independent and probably shouldn't involve a routine
- * call. This function is pretty good but will not work on
- * single character component names.
- */
-#define CHASH(nm) (((((nm)[0]) - ((nm)[1])) & 0x1f) + (((nm)[2]) & 0x5f))
-
-/*
- * Find a component in the hash table.
- */
-#define FINDCOMP(comp,name) \
- for (comp = wantcomp[CHASH(name)]; \
- comp && strcmp(comp->c_name,name); \
- comp = comp->c_next) \
- ;
-
/*
* This structure defines one formatting instruction.
*/
char f_u_char; /* literal character */
int f_u_value; /* literal value */
} f_un;
+ short f_flags; /* misc. flags */
};
#define f_skip f_width /* instr to skip (false "if") */
#define f_value f_un.f_u_value
/*
+ * f_flags bits
+ */
+
+#define FF_STRALLOC (1<<0) /* String has been allocated */
+#define FF_COMPREF (1<<1) /* Component reference */
+
+/*
* prototypes used by the format engine
*/
* strings that you want to compile and operate on the
* same message, this should be set to false.
*
- * Returns the number of components referenced by the format instructions.
+ * Returns the total number of components referenced by all format instructions
+ * since the last reset of the hash table.
*/
int fmt_compile (char *fstring, struct format **fmt, int reset);
struct comp *fmt_findcomp(char *component);
/*
+ * Search for a component structure in the component hash table.
+ *
+ * Identical to fmd_findcomp(), but is case-INSENSITIVE.
+ */
+
+struct comp *fmt_findcasecomp(char *component);
+
+/*
+ * Add a component entry to the component hash table
+ *
+ * component - The name of the component to add to the hash table.
+ *
+ * If the component is already in the hash table, this function will do
+ * nothing. Returns 1 if a component was added, 0 if it already existed.
+ */
+
+int fmt_addcompentry(char *component);
+
+/*
* Add a string to a component hash table entry. Arguments are:
*
* component - The name of the component to add text to. The component
*
* This function is designed to be called when you start processing a new
* component. The function returns the integer value of the hash table
- * bucket corresponding to this component.
+ * bucket corresponding to this component. If there was no entry found
+ * in the component hash table, this function will return -1.
*/
-int fmt_addcomp(char *component, char *text);
+int fmt_addcomptext(char *component, char *text);
/*
* Append to an existing component. Arguments are:
*
* bucket - The hash table bucket corresponding to this component,
- * as returned by fmt_addcomp().
+ * as returned by fmt_addcomp(). If -1, this function will
+ * return with no actions performed.
* component - The component to append text to. Like fmt_addcomp, the
* component is searched case-INSENSITIVELY.
* text - The text to append to the component. No special processing