Changeset 1672650


Ignore:
Timestamp:
Mar 7, 2010, 10:25:09 PM (10 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Branches:
master, release-1.6, release-1.7, release-1.8, release-1.9
Children:
40d22cf
Parents:
43e8bb2
git-author:
Anders Kaseorg <andersk@mit.edu> (02/27/10 20:03:38)
git-committer:
Anders Kaseorg <andersk@mit.edu> (03/07/10 22:25:09)
Message:
Rename atokenize_free to atokenize_delete.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • commands.c

    r8ae2de9 r1672650  
    16321632  }
    16331633  owl_free(newbuff);
    1634   atokenize_free(commands, ncommands);
     1634  atokenize_delete(commands, ncommands);
    16351635  return lastrv;
    16361636}
  • keybinding.c

    r12bc46a r1672650  
    2929  if (!ktokens) return(-1);
    3030  if (nktokens > OWL_KEYMAP_MAXSTACK) {
    31     atokenize_free(ktokens, nktokens);
     31    atokenize_delete(ktokens, nktokens);
    3232    return(-1);
    3333  }
     
    3636    kb->keys[i] = owl_keypress_fromstring(ktokens[i]);
    3737    if (kb->keys[i] == ERR) {
    38       atokenize_free(ktokens, nktokens);
     38      atokenize_delete(ktokens, nktokens);
    3939      owl_free(kb->keys);
    4040      return(-1);
     
    4343  kb->len = nktokens;
    4444
    45   atokenize_free(ktokens, nktokens);
     45  atokenize_delete(ktokens, nktokens);
    4646
    4747  if (command) kb->command = owl_strdup(command);
  • util.c

    r8ae2de9 r1672650  
    239239}
    240240
    241 void atokenize_free(char **tok, int nels)
     241void atokenize_delete(char **tok, int nels)
    242242{
    243243  int i;
  • variable.c

    r7a3a747 r1672650  
    929929  enums = atokenize(v->validsettings, ",", &nenums);
    930930  if (enums == NULL) return(0);
    931   atokenize_free(enums, nenums);
     931  atokenize_delete(enums, nenums);
    932932  val = *(const int*)newval;
    933933  if (val < 0 || val >= nenums) {
     
    948948    }
    949949  }
    950   atokenize_free(enums, nenums);
     950  atokenize_delete(enums, nenums);
    951951  if (val == -1) return(-1);
    952952  return (v->set_fn(v, &val));
     
    965965  if (i<0 || i>=nenums) {
    966966    snprintf(buf, bufsize, "<invalid:%d>",i);
    967     atokenize_free(enums, nenums);
     967    atokenize_delete(enums, nenums);
    968968    return(-1);
    969969  }
    970970  snprintf(buf, bufsize, "%s", enums[i]);
    971   atokenize_free(enums, nenums);
     971  atokenize_delete(enums, nenums);
    972972  return 0;
    973973}
Note: See TracChangeset for help on using the changeset viewer.