diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
commit | a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a (patch) | |
tree | ebfcd8a38514651c4657dac40601a5aafa360b89 /format.c | |
parent | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (diff) | |
parent | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (diff) |
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
-rw-r--r-- | format.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -648,9 +648,9 @@ format_find(struct format_tree *ft, const char *key, int modifiers) if (~modifiers & FORMAT_TIMESTRING) { envent = NULL; if (ft->s != NULL) - envent = environ_find(&ft->s->environ, key); + envent = environ_find(ft->s->environ, key); if (envent == NULL) - envent = environ_find(&global_environ, key); + envent = environ_find(global_environ, key); if (envent != NULL) { found = envent->value; goto found; |