diff options
| author |   ratchov <ratchov@openbsd.org> | 2015-07-17 09:51:18 +0000 |
|---|---|---|
| committer | ratchov <ratchov@openbsd.org> | 2015-07-17 09:51:18 +0000 |
| commit | e4bc365bbbb685f9ca66e6dd59aa5cc20dda9264 (patch) | |
| tree | 11a78c5c877da9d0eb93cd1f15968a6406af3276 | |
| parent | Move non-debug varibles outside #ifdef DEBUG block (diff) | |
| download | wireguard-openbsd-e4bc365bbbb685f9ca66e6dd59aa5cc20dda9264.tar.xz wireguard-openbsd-e4bc365bbbb685f9ca66e6dd59aa5cc20dda9264.zip | |
rename nfds to max_nfds, no object change
| -rw-r--r-- | usr.bin/sndiod/file.c | 8 | ||||
| -rw-r--r-- | usr.bin/sndiod/file.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/sndiod/file.c b/usr.bin/sndiod/file.c index 5b35bd661db..fbd2bf42603 100644 --- a/usr.bin/sndiod/file.c +++ b/usr.bin/sndiod/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.9 2015/07/17 09:43:28 ratchov Exp $ */ +/* $OpenBSD: file.c,v 1.10 2015/07/17 09:51:18 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> * @@ -233,7 +233,7 @@ file_new(struct fileops *ops, void *arg, char *name, unsigned int nfds) return NULL; } f = xmalloc(sizeof(struct file)); - f->nfds = nfds; + f->max_nfds = nfds; f->ops = ops; f->arg = arg; f->name = name; @@ -246,7 +246,7 @@ file_new(struct fileops *ops, void *arg, char *name, unsigned int nfds) log_puts(": created\n"); } #endif - file_nfds += f->nfds; + file_nfds += f->max_nfds; return f; } @@ -259,7 +259,7 @@ file_del(struct file *f) panic(); } #endif - file_nfds -= f->nfds; + file_nfds -= f->max_nfds; f->state = FILE_ZOMB; #ifdef DEBUG if (log_level >= 3) { diff --git a/usr.bin/sndiod/file.h b/usr.bin/sndiod/file.h index af9b7eddb5e..41636947971 100644 --- a/usr.bin/sndiod/file.h +++ b/usr.bin/sndiod/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.1 2012/11/23 07:03:28 ratchov Exp $ */ +/* $OpenBSD: file.h,v 1.2 2015/07/17 09:51:18 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> * @@ -53,7 +53,7 @@ struct file { #define FILE_INIT 0 /* ready */ #define FILE_ZOMB 1 /* closed, but not free()d yet */ unsigned int state; /* one of above */ - unsigned int nfds; /* max number of descriptors */ + unsigned int max_nfds; /* max number of descriptors */ char *name; /* for debug purposes */ }; |