From f769b4c237b6b3c9c473e6be69a2e992e8d93f8e Mon Sep 17 00:00:00 2001 From: bruceperens Date: Fri, 14 Mar 2014 02:13:48 +0000 Subject: [PATCH] Clean up, move "linux" facilities to "posix" where appropirate. git-svn-id: https://svn.code.sf.net/p/freetel/code@1441 01035d8c-6547-0410-b346-abe4f91aad63 --- freedv-server/source/big_main.cpp | 2 +- .../source/platform/{linux => posix}/privilege.cpp | 10 +++++----- .../source/platform/{linux => posix}/scheduler.cpp | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename freedv-server/source/platform/{linux => posix}/privilege.cpp (85%) rename freedv-server/source/platform/{linux => posix}/scheduler.cpp (100%) diff --git a/freedv-server/source/big_main.cpp b/freedv-server/source/big_main.cpp index a9e306f8..cbb2d29e 100644 --- a/freedv-server/source/big_main.cpp +++ b/freedv-server/source/big_main.cpp @@ -90,7 +90,7 @@ static const struct option options[] = { namespace FreeDV { const char * program_name = 0; -}; +} int main(int argc, char * * argv) diff --git a/freedv-server/source/platform/linux/privilege.cpp b/freedv-server/source/platform/posix/privilege.cpp similarity index 85% rename from freedv-server/source/platform/linux/privilege.cpp rename to freedv-server/source/platform/posix/privilege.cpp index 271e4848..0d72b2c2 100644 --- a/freedv-server/source/platform/linux/privilege.cpp +++ b/freedv-server/source/platform/posix/privilege.cpp @@ -21,15 +21,15 @@ namespace FreeDV { void check_privileges() { - const int uid = getuid(); - const int euid = geteuid(); + const uid_t uid = getuid(); + const uid_t euid = geteuid(); if ( uid == 0 || euid == 0 ) return; const struct group * audio = getgrnam("audio"); - const int gid = getgid(); - const int egid = getgid(); + const gid_t gid = getgid(); + const gid_t egid = getgid(); if ( audio ) { gid_t groups[NGROUPS_MAX]; @@ -40,7 +40,7 @@ namespace FreeDV { return; if ( (length = getgroups(size, groups)) > 0 ) { - for ( int i = 0; i < length; i++ ) { + for ( unsigned int i = 0; i < length; i++ ) { if ( groups[i] == audio->gr_gid ) return; } diff --git a/freedv-server/source/platform/linux/scheduler.cpp b/freedv-server/source/platform/posix/scheduler.cpp similarity index 100% rename from freedv-server/source/platform/linux/scheduler.cpp rename to freedv-server/source/platform/posix/scheduler.cpp -- 2.25.1