-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.44 2006/12/09 13:49:16 fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.46 2006/12/27 18:44:52 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
*
* Revisions :
* $Log: cgiedit.c,v $
+ * Revision 1.46 2006/12/27 18:44:52 fabiankeil
+ * Stop shadowing string.h's index().
+ *
+ * Revision 1.45 2006/12/21 12:57:48 fabiankeil
+ * Add config option "split-large-forms"
+ * to work around the browser bug reported
+ * in BR #1570678.
+ *
* Revision 1.44 2006/12/09 13:49:16 fabiankeil
* Fix configure option --disable-toggle.
* Thanks to Peter Thoenen for reporting this.
{
/* Must quote '#' characters */
int numhash = 0;
- int len;
+ size_t len;
char * src;
char * dest;
char * str;
/* Allocate new memory for string */
len = strlen(cur_line->unprocessed);
- if (NULL == (str = malloc((size_t) len + 1 + numhash)))
+ if (NULL == (str = malloc(len + 1 + (size_t)numhash)))
{
/* Uh oh, just trashed file! */
fclose(fp);
name_end--;
}
- name_len = name_end - line + 1; /* Length excluding \0 */
+ name_len = (size_t)(name_end - line) + 1; /* Length excluding \0 */
if (NULL == (*pname = (char *) malloc(name_len + 1)))
{
return JB_ERR_MEMORY;
char *name;
char *fullpath;
char ch;
- int len;
+ size_t len;
assert(csp);
assert(parameters);
}
}
- *p = value;
+ *p = (char)value;
return map(exports, buf, 0, "checked", 1);
}
{
/* We have some entries in the filter list */
char * result;
- int index = 0;
+ int filter_identifier = 0;
char * filter_template;
err = template_load(csp, &filter_template, "edit-actions-for-url-filter", 0);
}
/* Generate a unique serial number */
- snprintf(number, sizeof(number), "%x", index++);
+ snprintf(number, sizeof(number), "%x", filter_identifier++);
number[sizeof(number) - 1] = '\0';
line_exports = new_map();
unsigned line_number;
char target[1024];
jb_err err;
- int index;
+ int filter_identifier;
const char * action_set_name;
char ch;
struct file_list * fl;
get_string_param(parameters, "p", &action_set_name);
if (action_set_name != NULL)
{
- for (index = 0; index < MAX_AF_FILES; index++)
+ for (filter_identifier = 0; filter_identifier < MAX_AF_FILES; filter_identifier++)
{
- if (((fl = csp->actions_list[index]) != NULL) && ((b = fl->f) != NULL))
+ if (((fl = csp->actions_list[filter_identifier]) != NULL) && ((b = fl->f) != NULL))
{
for (b = b->next; NULL != b; b = b->next)
{
cur_line->data.action->multi_remove_all[ACTION_MULTI_FILTER] = 0;
}
- for (index = 0; !err; index++)
+ for (filter_identifier = 0; !err; filter_identifier++)
{
char key_value[30];
char key_name[30];
char value;
/* Generate the keys */
- snprintf(key_value, sizeof(key_value), "filter_r%x", index);
+ snprintf(key_value, sizeof(key_value), "filter_r%x", filter_identifier);
key_value[sizeof(key_value) - 1] = '\0';
- snprintf(key_name, sizeof(key_name), "filter_n%x", index);
+ snprintf(key_name, sizeof(key_name), "filter_n%x", filter_identifier);
key_name[sizeof(key_name) - 1] = '\0';
err = get_string_param(parameters, key_name, &name);