mixer

commit 0e489e949e8639bebfe30c41f33f423107a78ccf
parent 62236ad96cc43236f9efafd5c53e535abffb139a
Author: Christos Margiolis <christos@margiolis.net>
Date:   Wed, 25 Aug 2021 18:03:15 +0300

fixed cdefs and $FreeBSD$ tag

Diffstat:
M
mixer_lib/mixer.3
 | 
2
++
M
mixer_lib/mixer.c
 | 
2
++
M
mixer_lib/mixer.h
 | 
10
+++++-----
M
mixer_prog/mixer_prog.8
 | 
2
++
M
mixer_prog/mixer_prog.c
 | 
2
++

5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/mixer_lib/mixer.3 b/mixer_lib/mixer.3
@@ -19,6 +19,8 @@
 .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 .\" THE SOFTWARE.
 .\"
+.\" $FreeBSD$
+.\"
 
 .Dd June 30, 2021
 .Dt mixer 3
diff --git a/mixer_lib/mixer.c b/mixer_lib/mixer.c
@@ -18,6 +18,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/mixer_lib/mixer.h b/mixer_lib/mixer.h
@@ -18,22 +18,20 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _MIXER_H_
 #define _MIXER_H_
 
-__BEGIN_DECLS
-
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/queue.h>
 #include <sys/soundcard.h>
 
 #include <limits.h>
 
-#define MIX_ISSET(n,f)		(((1 << (n)) & (f)) ? 1 : 0)
+#define MIX_ISSET(n,f)		(((1U << (n)) & (f)) ? 1 : 0)
 #define MIX_ISDEV(m,n)		MIX_ISSET(n, (m)->devmask)
 #define MIX_ISMUTE(m,n)		MIX_ISSET(n, (m)->mutemask)
 #define MIX_ISREC(m,n)		MIX_ISSET(n, (m)->recmask)
@@ -100,6 +98,8 @@ struct mixer {
 	int f_default;				/* default mixer flag */
 };
 
+__BEGIN_DECLS
+
 struct mixer *mixer_open(const char *);
 int mixer_close(struct mixer *);
 struct mix_dev *mixer_get_dev(struct mixer *, int);
diff --git a/mixer_prog/mixer_prog.8 b/mixer_prog/mixer_prog.8
@@ -19,6 +19,8 @@
 .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 .\" THE SOFTWARE.
 .\"
+.\" $FreeBSD$
+.\"
 
 .Dd June 30, 2021
 .Dt mixer 8
diff --git a/mixer_prog/mixer_prog.c b/mixer_prog/mixer_prog.c
@@ -18,6 +18,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #include <err.h>