diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
| commit | 02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b (patch) | |
| tree | 61b9147863cd8be3eff63903dc36cae168254bd5 /src/util/profile | |
| parent | 162ab371748cba0cc6f172419bd6e71fa04bb878 (diff) | |
| download | krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.gz krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.xz krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.zip | |
make mark-cstyle
make reindent
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23100 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/profile')
| -rw-r--r-- | src/util/profile/argv_parse.c | 4 | ||||
| -rw-r--r-- | src/util/profile/argv_parse.h | 6 | ||||
| -rw-r--r-- | src/util/profile/prof_FSp_glue.c | 16 | ||||
| -rw-r--r-- | src/util/profile/prof_file.c | 8 | ||||
| -rw-r--r-- | src/util/profile/prof_get.c | 30 | ||||
| -rw-r--r-- | src/util/profile/prof_init.c | 33 | ||||
| -rw-r--r-- | src/util/profile/prof_int.h | 10 | ||||
| -rw-r--r-- | src/util/profile/prof_parse.c | 8 | ||||
| -rw-r--r-- | src/util/profile/prof_set.c | 37 | ||||
| -rw-r--r-- | src/util/profile/prof_tree.c | 28 | ||||
| -rw-r--r-- | src/util/profile/profile.hin | 10 | ||||
| -rw-r--r-- | src/util/profile/profile_tcl.c | 187 | ||||
| -rw-r--r-- | src/util/profile/test_parse.c | 6 | ||||
| -rw-r--r-- | src/util/profile/test_profile.c | 12 |
14 files changed, 195 insertions, 200 deletions
diff --git a/src/util/profile/argv_parse.c b/src/util/profile/argv_parse.c index 7740d5345..acdced8a3 100644 --- a/src/util/profile/argv_parse.c +++ b/src/util/profile/argv_parse.c @@ -1,7 +1,7 @@ /* * argv_parse.c --- utility function for parsing a string into a * argc, argv array. - * + * * This file defines a function argv_parse() which parsing a * passed-in string, handling double quotes and backslashes, and * creates an allocated argv vector which can be freed using the @@ -10,7 +10,7 @@ * See argv_parse.h for the formal definition of the functions. * * Copyright 1999 by Theodore Ts'o. - * + * * Permission to use, copy, modify, and distribute this software for * any purpose with or without fee is hereby granted, provided that * the above copyright notice and this permission notice appear in all diff --git a/src/util/profile/argv_parse.h b/src/util/profile/argv_parse.h index 84568e7bd..86f4564e5 100644 --- a/src/util/profile/argv_parse.h +++ b/src/util/profile/argv_parse.h @@ -3,7 +3,7 @@ * * This file defines the interface for the functions argv_parse() and * argv_free(). - * + * *********************************************************************** * int argv_parse(char *in_buf, int *ret_argc, char ***ret_argv) * @@ -16,12 +16,12 @@ * ret_argc and ret_argv, respectively. *********************************************************************** * extern void argv_free(char **argv); - * + * * This function frees the argument vector created by argv_parse(). *********************************************************************** * * Copyright 1999 by Theodore Ts'o. - * + * * Permission to use, copy, modify, and distribute this software for * any purpose with or without fee is hereby granted, provided that * the above copyright notice and this permission notice appear in all diff --git a/src/util/profile/prof_FSp_glue.c b/src/util/profile/prof_FSp_glue.c index 511c85f15..6b9b5f063 100644 --- a/src/util/profile/prof_FSp_glue.c +++ b/src/util/profile/prof_FSp_glue.c @@ -29,22 +29,22 @@ FSp_profile_init(files, ret_profile) break; fileCount++; } - + pathArray = (profile_filespec_t *) malloc ((fileCount + 1) * sizeof(const_profile_filespec_t)); if (pathArray == NULL) { retval = ENOMEM; } - + if (retval == 0) { for (i = 0; i < fileCount + 1; i++) { pathArray [i] = NULL; } } - + if (retval == 0) { for (i = 0; i < fileCount; i++) { OSStatus err = noErr; - + if (err == noErr) { pathArray[i] = (char *) malloc (sizeof(char) * PATH_MAX); if (pathArray[i] == NULL) { @@ -65,12 +65,12 @@ FSp_profile_init(files, ret_profile) } } } - + if (retval == 0) { - retval = profile_init ((const_profile_filespec_t *) pathArray, + retval = profile_init ((const_profile_filespec_t *) pathArray, ret_profile); } - + if (pathArray != NULL) { for (i = 0; i < fileCount; i++) { if (pathArray [i] != 0) @@ -78,7 +78,7 @@ FSp_profile_init(files, ret_profile) } free (pathArray); } - + return retval; } diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c index b24fa59f9..13aa18c4c 100644 --- a/src/util/profile/prof_file.c +++ b/src/util/profile/prof_file.c @@ -24,7 +24,7 @@ #if defined(_WIN32) #include <io.h> -#define HAVE_STAT +#define HAVE_STAT #define stat _stat #endif @@ -409,7 +409,7 @@ static errcode_t write_data_to_file(prf_data_t data, const char *outfile, errcode_t retval = 0; retval = ENOMEM; - + new_file = old_file = 0; if (asprintf(&new_file, "%s.$$$", outfile) < 0) { new_file = NULL; @@ -504,7 +504,7 @@ errcode_t profile_flush_file_data(prf_data_t data) retval = k5_mutex_lock(&data->lock); if (retval) return retval; - + if ((data->flags & PROFILE_FILE_DIRTY) == 0) { k5_mutex_unlock(&data->lock); return 0; @@ -600,7 +600,7 @@ static void profile_free_file_data(prf_data_t data) errcode_t profile_close_file(prf_file_t prf) { errcode_t retval; - + retval = profile_flush_file(prf); if (retval) return retval; diff --git a/src/util/profile/prof_get.c b/src/util/profile/prof_get.c index 6c94d96cc..87861fce3 100644 --- a/src/util/profile/prof_get.c +++ b/src/util/profile/prof_get.c @@ -76,7 +76,7 @@ static errcode_t add_to_list(struct profile_string_list *list, const char *str) { char *newstr, **newlist; unsigned int newmax; - + if (list->num+1 >= list->max) { newmax = list->max + 10; newlist = realloc(list->list, newmax * sizeof(char *)); @@ -109,8 +109,8 @@ static int is_list_member(struct profile_string_list *list, const char *str) return 1; } return 0; -} - +} + /* * This function frees a null-terminated list as returned by * profile_get_values. @@ -121,7 +121,7 @@ void KRB5_CALLCONV profile_free_list(char **list) if (list == 0) return; - + for (cp = list; *cp; cp++) free(*cp); free(list); @@ -158,7 +158,7 @@ profile_get_values(profile_t profile, const char *const *names, end_list(&values, ret_values); return 0; - + cleanup: end_list(&values, 0); return retval; @@ -187,7 +187,7 @@ errcode_t profile_get_value(profile_t profile, const char **names, *ret_value = value; else retval = PROF_NO_RELATION; - + cleanup: profile_node_iterator_free(&state); return retval; @@ -214,7 +214,7 @@ profile_get_string(profile_t profile, const char *name, const char *subname, return retval; } else value = def_val; - + if (value) { *ret_string = strdup(value); if (*ret_string == 0) @@ -264,8 +264,8 @@ profile_get_integer(profile_t profile, const char *name, const char *subname, /* Garbage in string. */ if (end_value != value + strlen (value)) return PROF_BAD_INTEGER; - - + + *ret_int = ret_long; return 0; } @@ -284,7 +284,7 @@ static errcode_t profile_parse_boolean(const char *s, int *ret_boolean) { const char *const *p; - + if (ret_boolean == NULL) return PROF_EINVAL; @@ -301,7 +301,7 @@ profile_parse_boolean(const char *s, int *ret_boolean) return 0; } } - + return PROF_BAD_BOOLEAN; } @@ -328,7 +328,7 @@ profile_get_boolean(profile_t profile, const char *name, const char *subname, return 0; } else if (retval) return retval; - + return profile_parse_boolean (value, ret_boolean); } @@ -362,7 +362,7 @@ profile_get_subsection_names(profile_t profile, const char **names, end_list(&values, ret_names); return 0; - + cleanup: end_list(&values, 0); return retval; @@ -398,7 +398,7 @@ profile_get_relation_names(profile_t profile, const char **names, end_list(&values, ret_names); return 0; - + cleanup: end_list(&values, 0); return retval; @@ -422,7 +422,7 @@ profile_iterator(void **iter_p, char **ret_name, char **ret_value) { char *name, *value; errcode_t retval; - + retval = profile_node_iterator(iter_p, 0, &name, &value); if (retval) return retval; diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c index d8653049c..91ace9810 100644 --- a/src/util/profile/prof_init.c +++ b/src/util/profile/prof_init.c @@ -118,7 +118,7 @@ profile_init_path(const_profile_filespec_list_t filepath, if (*s == ':') n_entries++; } - + /* the array is NULL terminated */ filenames = (profile_filespec_t*) malloc((n_entries+1) * sizeof(char*)); if (filenames == 0) @@ -144,7 +144,7 @@ profile_init_path(const_profile_filespec_list_t filepath, /* cap the array */ filenames[i] = 0; - retval = profile_init((const_profile_filespec_t *) filenames, + retval = profile_init((const_profile_filespec_t *) filenames, ret_profile); /* count back down and free the entries */ @@ -159,13 +159,13 @@ profile_is_writable(profile_t profile, int *writable) { if (!profile || profile->magic != PROF_MAGIC_PROFILE) return PROF_MAGIC_PROFILE; - - if (!writable) + + if (!writable) return EINVAL; - + if (profile->first_file) *writable = profile_file_is_writable(profile->first_file); - + return 0; } @@ -174,13 +174,13 @@ profile_is_modified(profile_t profile, int *modified) { if (!profile || profile->magic != PROF_MAGIC_PROFILE) return PROF_MAGIC_PROFILE; - - if (!modified) + + if (!modified) return EINVAL; - + if (profile->first_file) *modified = (profile->first_file->data->flags & PROFILE_FILE_DIRTY); - + return 0; } @@ -350,19 +350,19 @@ errcode_t profile_ser_internalize(const char *unused, profile_t *profilep, (void) unpack_int32(&tmp, &bp, &remain); else tmp = 0; - + if (tmp != PROF_MAGIC_PROFILE) { retval = EINVAL; goto cleanup; } - + (void) unpack_int32(&fcount, &bp, &remain); retval = ENOMEM; flist = (profile_filespec_t *) malloc(sizeof(profile_filespec_t) * (size_t) (fcount + 1)); if (!flist) goto cleanup; - + memset(flist, 0, sizeof(char *) * (size_t) (fcount+1)); for (i=0; i<fcount; i++) { if (!unpack_int32(&tmp, &bp, &remain)) { @@ -382,13 +382,13 @@ errcode_t profile_ser_internalize(const char *unused, profile_t *profilep, goto cleanup; } - if ((retval = profile_init((const_profile_filespec_t *) flist, + if ((retval = profile_init((const_profile_filespec_t *) flist, profilep))) goto cleanup; - + *bufpp = bp; *remainp = remain; - + cleanup: if (flist) { for (i=0; i<fcount; i++) { @@ -399,4 +399,3 @@ cleanup: } return(retval); } - diff --git a/src/util/profile/prof_int.h b/src/util/profile/prof_int.h index 216c5986d..9dc7d940d 100644 --- a/src/util/profile/prof_int.h +++ b/src/util/profile/prof_int.h @@ -73,7 +73,7 @@ typedef struct _prf_file_t *prf_file_t; /* * The profile flags * - * Deprecated use of read/write profile flag. + * Deprecated use of read/write profile flag. * Check whether file is writable lazily so we don't call access as often. */ #define PROFILE_FILE_DEPRECATED_RW 0x0001 @@ -136,7 +136,7 @@ errcode_t profile_add_node errcode_t profile_make_node_final (struct profile_node *node); - + int profile_is_node_final (struct profile_node *node); @@ -161,11 +161,11 @@ errcode_t profile_find_node_subsection (struct profile_node *section, const char *name, void **state, char **ret_name, struct profile_node **subsection); - + errcode_t profile_get_node_parent (struct profile_node *section, struct profile_node **parent); - + errcode_t profile_delete_node_relation (struct profile_node *section, const char *name); @@ -249,5 +249,5 @@ errcode_t profile_get_value (profile_t profile, const char **names, const char **ret_value); /* Others included from profile.h */ - + /* prof_set.c -- included from profile.h */ diff --git a/src/util/profile/prof_parse.c b/src/util/profile/prof_parse.c index 701d5e4a9..a48ae58e1 100644 --- a/src/util/profile/prof_parse.c +++ b/src/util/profile/prof_parse.c @@ -81,7 +81,7 @@ static errcode_t parse_std_line(char *line, struct parse_state *state) struct profile_node *node; int do_subsection = 0; void *iter = 0; - + if (*line == 0) return 0; cp = skip_over_blanks(line); @@ -120,7 +120,7 @@ static errcode_t parse_std_line(char *line, struct parse_state *state) cp++; } /* - * A space after ']' should not be fatal + * A space after ']' should not be fatal */ cp = skip_over_blanks(cp); if (*cp) @@ -203,7 +203,7 @@ static errcode_t parse_std_line(char *line, struct parse_state *state) static errcode_t parse_line(char *line, struct parse_state *state) { char *cp; - + switch (state->state) { case STATE_INIT_COMMENT: if (line[0] != '[') @@ -380,7 +380,7 @@ static void dump_profile(struct profile_node *root, int level, void *iter; long retval; char *name, *value; - + iter = 0; do { retval = profile_find_node_relation(root, 0, &iter, diff --git a/src/util/profile/prof_set.c b/src/util/profile/prof_set.c index 85f228630..a08bfd757 100644 --- a/src/util/profile/prof_set.c +++ b/src/util/profile/prof_set.c @@ -7,7 +7,7 @@ * In the future it may be necessary to modify this public interface, * or possibly add higher level functions to support this correctly. * - * WARNING: We're not yet doing locking yet, either. + * WARNING: We're not yet doing locking yet, either. * */ @@ -74,15 +74,15 @@ static errcode_t rw_setup(profile_t profile) } -/* - * Delete or update a particular child node - * +/* + * Delete or update a particular child node + * * ADL - 2/23/99, rewritten TYT 2/25/99 */ errcode_t KRB5_CALLCONV profile_update_relation(profile_t profile, const char **names, const char *old_value, const char *new_value) -{ +{ errcode_t retval; struct profile_node *section, *node; void *state; @@ -91,7 +91,7 @@ profile_update_relation(profile_t profile, const char **names, retval = rw_setup(profile); if (retval) return retval; - + if (names == 0 || names[0] == 0 || names[1] == 0) return PROF_BAD_NAMESET; @@ -123,18 +123,18 @@ profile_update_relation(profile_t profile, const char **names, if (retval == 0) profile->first_file->data->flags |= PROFILE_FILE_DIRTY; k5_mutex_unlock(&profile->first_file->data->lock); - + return retval; } -/* +/* * Clear a particular all of the relations with a specific name. - * + * * TYT - 2/25/99 */ errcode_t KRB5_CALLCONV profile_clear_relation(profile_t profile, const char **names) -{ +{ errcode_t retval; struct profile_node *section, *node; void *state; @@ -143,7 +143,7 @@ profile_clear_relation(profile_t profile, const char **names) retval = rw_setup(profile); if (retval) return retval; - + if (names == 0 || names[0] == 0 || names[1] == 0) return PROF_BAD_NAMESET; @@ -167,29 +167,29 @@ profile_clear_relation(profile_t profile, const char **names) } while (state); profile->first_file->data->flags |= PROFILE_FILE_DIRTY; - + return 0; } -/* +/* * Rename a particular section; if the new_section name is NULL, * delete it. - * + * * ADL - 2/23/99, rewritten TYT 2/25/99 */ errcode_t KRB5_CALLCONV profile_rename_section(profile_t profile, const char **names, const char *new_name) -{ +{ errcode_t retval; struct profile_node *section, *node; void *state; const char **cpp; - + retval = rw_setup(profile); if (retval) return retval; - + if (names == 0 || names[0] == 0 || names[1] == 0) return PROF_BAD_NAMESET; @@ -242,7 +242,7 @@ profile_add_relation(profile_t profile, const char **names, retval = rw_setup(profile); if (retval) return retval; - + if (names == 0 || names[0] == 0 || names[1] == 0) return PROF_BAD_NAMESET; @@ -283,4 +283,3 @@ profile_add_relation(profile_t profile, const char **names, k5_mutex_unlock(&profile->first_file->data->lock); return 0; } - diff --git a/src/util/profile/prof_tree.c b/src/util/profile/prof_tree.c index d8db45daf..6663dc1b5 100644 --- a/src/util/profile/prof_tree.c +++ b/src/util/profile/prof_tree.c @@ -1,16 +1,16 @@ /* * prof_tree.c --- these routines maintain the parse tree of the * config file. - * + * * All of the details of how the tree is stored is abstracted away in * this file; all of the other profile routines build, access, and * modify the tree via the accessor functions found in this file. * * Each node may represent either a relation or a section header. - * + * * A section header must have its value field set to 0, and may a one * or more child nodes, pointed to by first_child. - * + * * A relation has as its value a pointer to allocated memory * containing a string. Its first_child pointer must be null. * @@ -52,7 +52,7 @@ void profile_free_node(struct profile_node *node) if (node->magic != PROF_MAGIC_NODE) return; - + if (node->name) free(node->name); if (node->value) @@ -63,7 +63,7 @@ void profile_free_node(struct profile_node *node) profile_free_node(child); } node->magic = 0; - + free(node); } @@ -159,7 +159,7 @@ errcode_t profile_add_node(struct profile_node *section, const char *name, /* * Find the place to insert the new node. We look for the - * place *after* the last match of the node name, since + * place *after* the last match of the node name, since * order matters. */ for (p=section->first_child, last = 0; p; last = p, p = p->next) { @@ -233,7 +233,7 @@ const char *profile_get_node_value(struct profile_node *node) * section which matches the name; don't return relations. If value * is non-NULL, then only return relations which match the requested * value. (The value argument is ignored if section_flag is non-zero.) - * + * * The first time this routine is called, the state pointer must be * null. When this profile_find_node_relation() returns, if the state * pointer is non-NULL, then this routine should be called again. @@ -252,7 +252,7 @@ errcode_t profile_find_node(struct profile_node *section, const char *name, CHECK_MAGIC(p); } else p = section->first_child; - + for (; p; p = p->next) { if (name && (strcmp(p->name, name))) continue; @@ -344,7 +344,7 @@ errcode_t profile_find_node_relation(struct profile_node *section, * * This is (plus accessor functions for the name and value given a * profile node) makes this function mostly syntactic sugar for - * profile_find_node. + * profile_find_node. */ errcode_t profile_find_node_subsection(struct profile_node *section, const char *name, void **state, @@ -379,7 +379,7 @@ errcode_t profile_get_node_parent(struct profile_node *section, /* * This is a general-purpose iterator for returning all nodes that - * match the specified name array. + * match the specified name array. */ struct profile_iterator { prf_magic_t magic; @@ -601,9 +601,9 @@ get_new_file: return 0; } -/* +/* * Remove a particular node. - * + * * TYT, 2/25/99 */ errcode_t profile_remove_node(struct profile_node *node) @@ -612,7 +612,7 @@ errcode_t profile_remove_node(struct profile_node *node) if (node->parent == 0) return PROF_EINVAL; /* Can't remove the root! */ - + node->deleted = 1; return 0; @@ -627,7 +627,7 @@ errcode_t profile_set_relation_value(struct profile_node *node, const char *new_value) { char *cp; - + CHECK_MAGIC(node); if (!node->value) diff --git a/src/util/profile/profile.hin b/src/util/profile/profile.hin index 10abe725a..128676c6f 100644 --- a/src/util/profile/profile.hin +++ b/src/util/profile/profile.hin @@ -72,7 +72,7 @@ void KRB5_CALLCONV profile_free_list (char **list); long KRB5_CALLCONV profile_get_string - (profile_t profile, const char *name, const char *subname, + (profile_t profile, const char *name, const char *subname, const char *subsubname, const char *def_val, char **ret_string); long KRB5_CALLCONV profile_get_integer @@ -97,25 +97,25 @@ long KRB5_CALLCONV profile_iterator_create void KRB5_CALLCONV profile_iterator_free (void **iter_p); - + long KRB5_CALLCONV profile_iterator (void **iter_p, char **ret_name, char **ret_value); void KRB5_CALLCONV profile_release_string (char *str); long KRB5_CALLCONV profile_update_relation - (profile_t profile, const char **names, + (profile_t profile, const char **names, const char *old_value, const char *new_value); long KRB5_CALLCONV profile_clear_relation (profile_t profile, const char **names); long KRB5_CALLCONV profile_rename_section - (profile_t profile, const char **names, + (profile_t profile, const char **names, const char *new_name); long KRB5_CALLCONV profile_add_relation - (profile_t profile, const char **names, + (profile_t profile, const char **names, const char *new_value); #ifdef __cplusplus diff --git a/src/util/profile/profile_tcl.c b/src/util/profile/profile_tcl.c index 6a2476e47..199c01b29 100644 --- a/src/util/profile/profile_tcl.c +++ b/src/util/profile/profile_tcl.c @@ -1,11 +1,11 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version 1.3.21 - * - * This file is not intended to be easily readable and contains a number of + * + * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. * ----------------------------------------------------------------------------- */ /*************************************************************** -*- c -*- @@ -23,8 +23,8 @@ #define SWIG_TypeName SWIG_Tcl_TypeName #define SWIG_TypeQuery SWIG_Tcl_TypeQuery #define SWIG_TypeClientData SWIG_Tcl_TypeClientData -#define SWIG_PackData SWIG_Tcl_PackData -#define SWIG_UnpackData SWIG_Tcl_UnpackData +#define SWIG_PackData SWIG_Tcl_PackData +#define SWIG_UnpackData SWIG_Tcl_UnpackData /*********************************************************************** @@ -37,7 +37,7 @@ * Author : David Beazley (beazley@cs.uchicago.edu) * * Copyright (c) 1999-2000, The University of Chicago - * + * * This file may be freely redistributed without license or fee provided * this copyright message remains intact. ************************************************************************/ @@ -146,7 +146,7 @@ SWIG_TypeRegister(swig_type_info *ti) { } /* Check the typename */ -SWIGRUNTIME(swig_type_info *) +SWIGRUNTIME(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *ty) { swig_type_info *s; if (!ty) return 0; /* Void pointer */ @@ -172,14 +172,14 @@ SWIG_TypeCheck(char *c, swig_type_info *ty) { } /* Cast a pointer up an inheritance hierarchy */ -SWIGRUNTIME(void *) +SWIGRUNTIME(void *) SWIG_TypeCast(swig_type_info *ty, void *ptr) { if ((!ty) || (!ty->converter)) return ptr; return (*ty->converter)(ptr); } /* Dynamic pointer casting. Down an inheritance hierarchy */ -SWIGRUNTIME(swig_type_info *) +SWIGRUNTIME(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { swig_type_info *lastty = ty; if (!ty || !ty->dcast) return ty; @@ -274,7 +274,7 @@ SWIG_UnpackData(char *c, void *ptr, int sz) { /* * $Header: /cvsroot/SWIG/Lib/tcl/swigtcl8.swg,v 1.19 2003/12/09 12:44:49 beazley Exp $ - * + * * swigtcl8.swg */ @@ -453,7 +453,7 @@ SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type continue; } Tcl_ResetResult(interp); - if (flags & SWIG_POINTER_EXCEPTION) + if (flags & SWIG_POINTER_EXCEPTION) Tcl_SetResult(interp, (char *) "Type error. Expected a pointer", TCL_STATIC); return TCL_ERROR; } @@ -1036,13 +1036,13 @@ typedef struct { /* -------- TYPES TABLE (BEGIN) -------- */ -#define SWIGTYPE_p_p_char swig_types[0] -#define SWIGTYPE_p_p_p_char swig_types[1] -#define SWIGTYPE_p_iter_t swig_types[2] -#define SWIGTYPE_iter_t swig_types[3] -#define SWIGTYPE_p_profile_t swig_types[4] -#define SWIGTYPE_profile_t swig_types[5] -#define SWIGTYPE_p_int swig_types[6] +#define SWIGTYPE_p_p_char swig_types[0] +#define SWIGTYPE_p_p_p_char swig_types[1] +#define SWIGTYPE_p_iter_t swig_types[2] +#define SWIGTYPE_iter_t swig_types[3] +#define SWIGTYPE_p_profile_t swig_types[4] +#define SWIGTYPE_profile_t swig_types[5] +#define SWIGTYPE_p_int swig_types[6] static swig_type_info *swig_types[8]; /* -------- TYPES TABLE (END) -------- */ @@ -1077,7 +1077,7 @@ SWIGEXPORT(int) SWIG_init(Tcl_Interp *); * require a specific license from the United States Government. * It is the responsibility of any person or organization contemplating * export to obtain such a license before exporting. - * + * * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and * distribute this software and its documentation for any purpose and * without fee is hereby granted, provided that the above copyright @@ -1179,7 +1179,7 @@ extern int MacintoshInit _ANSI_ARGS_((void)); int Tcl_AppInit(Tcl_Interp *interp){ - if (Tcl_Init(interp) == TCL_ERROR) + if (Tcl_Init(interp) == TCL_ERROR) return TCL_ERROR; /* Now initialize our functions */ @@ -1194,7 +1194,7 @@ int Tcl_AppInit(Tcl_Interp *interp){ #ifdef SWIG_RcRsrcName Tcl_SetVar(interp, (char *) "tcl_rcRsrcName",SWIG_RcRsrcName,TCL_GLOBAL); #endif - + return TCL_OK; } @@ -1202,7 +1202,7 @@ int Tcl_AppInit(Tcl_Interp *interp){ int main(int argc, char **argv) { #ifdef MAC_TCL char *newArgv[2]; - + if (MacintoshInit() != TCL_OK) { Tcl_Exit(1); } @@ -1231,13 +1231,13 @@ _wrap_profile_init_path(ClientData clientData, Tcl_Interp *interp, int objc, Tcl profile_t *arg2 = (profile_t *) 0 ; errcode_t result; profile_t tmp2 ; - + { /*generic swigtype hack*/ arg2 = &tmp2; } if (SWIG_GetArgs(interp, objc, objv,"|s:profile_init_path ?path? ",&arg1) == TCL_ERROR) SWIG_fail; result = (errcode_t)profile_init_path((char const *)arg1,arg2); - + { /* out errcode_t result */ if (result) { @@ -1260,7 +1260,7 @@ _wrap_profile_init(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj profile_t *arg2 = (profile_t *) 0 ; errcode_t result; profile_t tmp2 ; - + { /*generic swigtype hack*/ arg2 = &tmp2; } @@ -1273,7 +1273,7 @@ _wrap_profile_init(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj } } result = (errcode_t)profile_init((char const **)arg1,arg2); - + { /* out errcode_t result */ if (result) { @@ -1287,7 +1287,7 @@ _wrap_profile_init(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj { /* freearg char **nullterm */ if (arg1) { - Tcl_Free((char *)arg1); arg1 = (char **) NULL; + Tcl_Free((char *)arg1); arg1 = (char **) NULL; } } return TCL_OK; @@ -1295,7 +1295,7 @@ _wrap_profile_init(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj { /* freearg char **nullterm */ if (arg1) { - Tcl_Free((char *)arg1); arg1 = (char **) NULL; + Tcl_Free((char *)arg1); arg1 = (char **) NULL; } } return TCL_ERROR; @@ -1306,11 +1306,11 @@ static int _wrap_profile_flush(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { profile_t arg1 = (profile_t) 0 ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"o:profile_flush profile_t ",0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_flush(arg1); - + { /* out errcode_t result */ if (result) { @@ -1331,11 +1331,11 @@ _wrap_profile_flush_to_file(ClientData clientData, Tcl_Interp *interp, int objc, profile_t arg1 = (profile_t) 0 ; char *arg2 ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"os:profile_flush_to_file profile_t path ",0,&arg2) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_flush_to_file(arg1,(char const *)arg2); - + { /* out errcode_t result */ if (result) { @@ -1354,12 +1354,12 @@ _wrap_profile_flush_to_file(ClientData clientData, Tcl_Interp *interp, int objc, static int _wrap_profile_abandon(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { profile_t arg1 = (profile_t) 0 ; - + if (SWIG_GetArgs(interp, objc, objv,"o:profile_abandon profile_t ",0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; profile_abandon(arg1); - - + + return TCL_OK; fail: return TCL_ERROR; @@ -1369,12 +1369,12 @@ _wrap_profile_abandon(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_O static int _wrap_profile_release(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { profile_t arg1 = (profile_t) 0 ; - + if (SWIG_GetArgs(interp, objc, objv,"o:profile_release profile_t ",0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; profile_release(arg1); - - + + return TCL_OK; fail: return TCL_ERROR; @@ -1388,7 +1388,7 @@ _wrap_profile_get_values(ClientData clientData, Tcl_Interp *interp, int objc, Tc char ***arg3 = (char ***) 0 ; errcode_t result; char **tmp3 ; - + { /* in char ***OUTPUT */ tmp3 = NULL; @@ -1402,7 +1402,7 @@ _wrap_profile_get_values(ClientData clientData, Tcl_Interp *interp, int objc, Tc if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_get_values(arg1,(char const **)arg2,arg3); - + { /* out errcode_t result */ if (result) { @@ -1421,7 +1421,7 @@ _wrap_profile_get_values(ClientData clientData, Tcl_Interp *interp, int objc, Tc { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } { @@ -1433,7 +1433,7 @@ _wrap_profile_get_values(ClientData clientData, Tcl_Interp *interp, int objc, Tc { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } { @@ -1454,7 +1454,7 @@ _wrap_profile_get_string(ClientData clientData, Tcl_Interp *interp, int objc, Tc char **arg6 = (char **) 0 ; errcode_t result; char *tmp6 ; - + { /* in char **OUTPUT */ tmp6 = NULL; @@ -1463,7 +1463,7 @@ _wrap_profile_get_string(ClientData clientData, Tcl_Interp *interp, int objc, Tc if (SWIG_GetArgs(interp, objc, objv,"oss|ss:profile_get_string p name subname ?subsubname? ?defval? ",0,&arg2,&arg3,&arg4,&arg5) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_get_string(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6); - + { /* out errcode_t result */ if (result) { @@ -1506,12 +1506,12 @@ _wrap_profile_get_integer(ClientData clientData, Tcl_Interp *interp, int objc, T int *arg6 = (int *) 0 ; errcode_t result; int temp6 ; - + arg6 = &temp6; if (SWIG_GetArgs(interp, objc, objv,"oss|si:profile_get_integer p name subname ?subsubname? ?defval? ",0,&arg2,&arg3,&arg4,&arg5) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_get_integer(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6); - + { /* out errcode_t result */ if (result) { @@ -1542,12 +1542,12 @@ _wrap_profile_get_boolean(ClientData clientData, Tcl_Interp *interp, int objc, T int *arg6 = (int *) 0 ; errcode_t result; int temp6 ; - + arg6 = &temp6; if (SWIG_GetArgs(interp, objc, objv,"oss|si:profile_get_boolean p name subname ?subsubname? ?defval? ",0,&arg2,&arg3,&arg4,&arg5) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_get_boolean(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6); - + { /* out errcode_t result */ if (result) { @@ -1575,7 +1575,7 @@ _wrap_profile_get_relation_names(ClientData clientData, Tcl_Interp *interp, int char ***arg3 = (char ***) 0 ; errcode_t result; char **tmp3 ; - + { /* in char ***OUTPUT */ tmp3 = NULL; @@ -1589,7 +1589,7 @@ _wrap_profile_get_relation_names(ClientData clientData, Tcl_Interp *interp, int if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_get_relation_names(arg1,(char const **)arg2,arg3); - + { /* out errcode_t result */ if (result) { @@ -1608,7 +1608,7 @@ _wrap_profile_get_relation_names(ClientData clientData, Tcl_Interp *interp, int { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } { @@ -1620,7 +1620,7 @@ _wrap_profile_get_relation_names(ClientData clientData, Tcl_Interp *interp, int { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } { @@ -1638,7 +1638,7 @@ _wrap_profile_get_subsection_names(ClientData clientData, Tcl_Interp *interp, in char ***arg3 = (char ***) 0 ; errcode_t result; char **tmp3 ; - + { /* in char ***OUTPUT */ tmp3 = NULL; @@ -1652,7 +1652,7 @@ _wrap_profile_get_subsection_names(ClientData clientData, Tcl_Interp *interp, in if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_get_subsection_names(arg1,(char const **)arg2,arg3); - + { /* out errcode_t result */ if (result) { @@ -1671,7 +1671,7 @@ _wrap_profile_get_subsection_names(ClientData clientData, Tcl_Interp *interp, in { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } { @@ -1683,7 +1683,7 @@ _wrap_profile_get_subsection_names(ClientData clientData, Tcl_Interp *interp, in { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } { @@ -1702,7 +1702,7 @@ _wrap_profile_iterator_create(ClientData clientData, Tcl_Interp *interp, int obj iter_t *arg4 = (iter_t *) 0 ; errcode_t result; iter_t tmp4 ; - + { /*generic swigtype hack*/ arg4 = &tmp4; } @@ -1714,7 +1714,7 @@ _wrap_profile_iterator_create(ClientData clientData, Tcl_Interp *interp, int obj if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)iter_create(arg1,(char const **)arg2,arg3,arg4); - + { /* out errcode_t result */ if (result) { @@ -1728,7 +1728,7 @@ _wrap_profile_iterator_create(ClientData clientData, Tcl_Interp *interp, int obj { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_OK; @@ -1736,7 +1736,7 @@ _wrap_profile_iterator_create(ClientData clientData, Tcl_Interp *interp, int obj { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_ERROR; @@ -1747,11 +1747,11 @@ static int _wrap_profile_iterator_free(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { iter_t arg1 = (iter_t) 0 ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"o:profile_iterator_free i ",0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_iter_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)iter_free(arg1); - + { /* out errcode_t result */ if (result) { @@ -1775,7 +1775,7 @@ _wrap_profile_iterator(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_ errcode_t result; char *tmp2 ; char *tmp3 ; - + { /* in char **OUTPUT */ tmp2 = NULL; @@ -1789,7 +1789,7 @@ _wrap_profile_iterator(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_ if (SWIG_GetArgs(interp, objc, objv,"o:profile_iterator iter_t ",0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_iter_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_iterator(arg1,arg2,arg3); - + { /* out errcode_t result */ if (result) { @@ -1846,7 +1846,7 @@ _wrap_profile_update_relation(ClientData clientData, Tcl_Interp *interp, int obj char *arg3 ; char *arg4 = (char *) NULL ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"oos|s:profile_update_relation p nullterm oldval ?newval? ",0,0,&arg3,&arg4) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; { @@ -1855,7 +1855,7 @@ _wrap_profile_update_relation(ClientData clientData, Tcl_Interp *interp, int obj if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_update_relation(arg1,(char const **)arg2,(char const *)arg3,(char const *)arg4); - + { /* out errcode_t result */ if (result) { @@ -1868,7 +1868,7 @@ _wrap_profile_update_relation(ClientData clientData, Tcl_Interp *interp, int obj { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_OK; @@ -1876,7 +1876,7 @@ _wrap_profile_update_relation(ClientData clientData, Tcl_Interp *interp, int obj { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_ERROR; @@ -1888,7 +1888,7 @@ _wrap_profile_clear_relation(ClientData clientData, Tcl_Interp *interp, int objc profile_t arg1 = (profile_t) 0 ; char **arg2 = (char **) 0 ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"oo:profile_clear_relation p nullterm ",0,0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; { @@ -1897,7 +1897,7 @@ _wrap_profile_clear_relation(ClientData clientData, Tcl_Interp *interp, int objc if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_clear_relation(arg1,(char const **)arg2); - + { /* out errcode_t result */ if (result) { @@ -1910,7 +1910,7 @@ _wrap_profile_clear_relation(ClientData clientData, Tcl_Interp *interp, int objc { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_OK; @@ -1918,7 +1918,7 @@ _wrap_profile_clear_relation(ClientData clientData, Tcl_Interp *interp, int objc { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_ERROR; @@ -1931,7 +1931,7 @@ _wrap_profile_rename_section(ClientData clientData, Tcl_Interp *interp, int objc char **arg2 = (char **) 0 ; char *arg3 = (char *) NULL ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"oo|s:profile_rename_section p nullterm ?new_name? ",0,0,&arg3) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; { @@ -1940,7 +1940,7 @@ _wrap_profile_rename_section(ClientData clientData, Tcl_Interp *interp, int objc if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_rename_section(arg1,(char const **)arg2,(char const *)arg3); - + { /* out errcode_t result */ if (result) { @@ -1953,7 +1953,7 @@ _wrap_profile_rename_section(ClientData clientData, Tcl_Interp *interp, int objc { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_OK; @@ -1961,7 +1961,7 @@ _wrap_profile_rename_section(ClientData clientData, Tcl_Interp *interp, int objc { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_ERROR; @@ -1974,7 +1974,7 @@ _wrap_profile_add_relation(ClientData clientData, Tcl_Interp *interp, int objc, char **arg2 = (char **) 0 ; char *arg3 = (char *) NULL ; errcode_t result; - + if (SWIG_GetArgs(interp, objc, objv,"oo|s:profile_add_relation p nullterm ?new_val? ",0,0,&arg3) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; { @@ -1983,7 +1983,7 @@ _wrap_profile_add_relation(ClientData clientData, Tcl_Interp *interp, int objc, if (Tcl_SplitList(interp, Tcl_GetStringFromObj(objv[2],NULL), &n, &arg2) == TCL_ERROR) SWIG_fail; } result = (errcode_t)profile_add_relation(arg1,(char const **)arg2,(char const *)arg3); - + { /* out errcode_t result */ if (result) { @@ -1996,7 +1996,7 @@ _wrap_profile_add_relation(ClientData clientData, Tcl_Interp *interp, int objc, { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_OK; @@ -2004,7 +2004,7 @@ _wrap_profile_add_relation(ClientData clientData, Tcl_Interp *interp, int objc, { /* freearg char **nullterm */ if (arg2) { - Tcl_Free((char *)arg2); arg2 = (char **) NULL; + Tcl_Free((char *)arg2); arg2 = (char **) NULL; } } return TCL_ERROR; @@ -2017,7 +2017,7 @@ _wrap_profile_flush_to_buffer(ClientData clientData, Tcl_Interp *interp, int obj char **arg2 = (char **) 0 ; errcode_t result; char *tmp2 ; - + { /* in char **OUTPUT */ tmp2 = NULL; @@ -2026,7 +2026,7 @@ _wrap_profile_flush_to_buffer(ClientData clientData, Tcl_Interp *interp, int obj if (SWIG_GetArgs(interp, objc, objv,"o:profile_flush_to_buffer p ",0) == TCL_ERROR) SWIG_fail; if ((SWIG_ConvertPtr(objv[1], (void **) &arg1, SWIGTYPE_profile_t,SWIG_POINTER_EXCEPTION | 0) != TCL_OK)) SWIG_fail; result = (errcode_t)profile_flush_to_buffer(arg1,arg2); - + { /* out errcode_t result */ if (result) { @@ -2103,13 +2103,13 @@ static swig_type_info _swigt__profile_t[] = {{"_profile_t", 0, "profile_t", 0},{ static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; static swig_type_info *swig_types_initial[] = { -_swigt__p_p_char, -_swigt__p_p_p_char, -_swigt__p_iter_t, -_swigt__iter_t, -_swigt__p_profile_t, -_swigt__profile_t, -_swigt__p_int, +_swigt__p_p_char, +_swigt__p_p_p_char, +_swigt__p_iter_t, +_swigt__iter_t, +_swigt__p_profile_t, +_swigt__profile_t, +_swigt__p_int, 0 }; @@ -2129,9 +2129,9 @@ SWIGEXPORT(int) SWIG_init(Tcl_Interp *interp) { return TCL_ERROR; } #endif - + Tcl_PkgProvide(interp, (char*)SWIG_name, (char*)SWIG_version); - + #ifdef SWIG_namespace Tcl_Eval(interp, "namespace eval " SWIG_namespace " { }"); #endif @@ -2150,10 +2150,9 @@ SWIGEXPORT(int) SWIG_init(Tcl_Interp *interp) { Tcl_TraceVar(interp, (char *) swig_variables[i].name, TCL_TRACE_WRITES | TCL_GLOBAL_ONLY, (Tcl_VarTraceProc *) swig_variables[i].set, (ClientData) swig_variables[i].addr); } SWIG_InstallConstants(interp, swig_constants); - + return TCL_OK; } SWIGEXPORT(int) Profile_SafeInit(Tcl_Interp *interp) { return SWIG_init(interp); } - diff --git a/src/util/profile/test_parse.c b/src/util/profile/test_parse.c index 961149c80..f524c90f2 100644 --- a/src/util/profile/test_parse.c +++ b/src/util/profile/test_parse.c @@ -32,15 +32,15 @@ int main(argc, argv) retval = profile_parse_file(f, &root); if (retval) { - printf("profile_parse_file error %s\n", + printf("profile_parse_file error %s\n", error_message((errcode_t) retval)); exit(1); } fclose(f); - + printf("\n\nDebugging dump.\n"); profile_write_tree_file(root, stdout); - + retval = profile_verify_node(root); if (retval) { printf("profile_verify_node reported an error: %s\n", diff --git a/src/util/profile/test_profile.c b/src/util/profile/test_profile.c index 5cdbf7689..6f47a7d4e 100644 --- a/src/util/profile/test_profile.c +++ b/src/util/profile/test_profile.c @@ -53,11 +53,11 @@ static void do_batchmode(profile) retval = profile_get_value(profile, names, &value); print_status = PRINT_VALUE; } else if (!strcmp(cmd, "list_sections")) { - retval = profile_get_subsection_names(profile, names, + retval = profile_get_subsection_names(profile, names, &values); print_status = PRINT_VALUES; } else if (!strcmp(cmd, "list_relations")) { - retval = profile_get_relation_names(profile, names, + retval = profile_get_relation_names(profile, names, &values); print_status = PRINT_VALUES; } else if (!strcmp(cmd, "dump")) { @@ -104,7 +104,7 @@ static void do_batchmode(profile) } profile_release(profile); exit(0); - + } @@ -119,14 +119,14 @@ int main(argc, argv) const char **names; char *cmd; int print_value = 0; - + if (argc < 2) { fprintf(stderr, "Usage: %s filename [cmd argset]\n", program_name); exit(1); } initialize_prof_error_table(); - + retval = profile_init_path(argv[1], &profile); if (retval) { com_err(program_name, retval, "while initializing profile"); @@ -165,5 +165,3 @@ int main(argc, argv) return 0; } - - |
