summaryrefslogtreecommitdiff
path: root/usr.bin/sndiod
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2015-07-17 09:51:19 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2015-07-17 09:51:19 +0000
commit8761b7cb5fffec63085436ce9ef076ed4329a818 (patch)
treecf0c619b7b023c92de09bea4b38eb354ed18707e /usr.bin/sndiod
parent489d766495aa19d12e8a5cada80b126b6eba8cae (diff)
rename nfds to max_nfds, no object change
Diffstat (limited to 'usr.bin/sndiod')
-rw-r--r--usr.bin/sndiod/file.c8
-rw-r--r--usr.bin/sndiod/file.h4
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 */
};