Skip to content

M
mpd
Commit 06a00857 authored by Avuton Olrich's avatar Avuton Olrich
Browse files
Options

[CLEANUP] Cleanup whitespace->tabs

Static where it makes sense git-svn-id: https://svn.musicpd.org/mpd/trunk@4339 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent a8938c91
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
src/permission.c
View file @ 06a00857
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
#define PERMISSION_CONTROL_STRING "control" #define PERMISSION_CONTROL_STRING "control"
#define PERMISSION_ADMIN_STRING "admin" #define PERMISSION_ADMIN_STRING "admin"
List * permission_passwords; static List * permission_passwords;
unsigned int permission_default; static unsigned int permission_default;
unsigned int parsePermissions(char * string) { static unsigned int parsePermissions(char * string) {
unsigned int permission = 0; unsigned int permission = 0;
char * temp; char * temp;
char * tok; char * tok;
...@@ -73,45 +73,45 @@ void initPermissions() { ...@@ -73,45 +73,45 @@ void initPermissions() {
char * cp2; char * cp2;
char * password; char * password;
unsigned int * permission; unsigned int * permission;
ConfigParam * param; ConfigParam * param;
permission_passwords = makeList(free, 1); permission_passwords = makeList(free, 1);
permission_default = PERMISSION_READ | PERMISSION_ADD | permission_default = PERMISSION_READ | PERMISSION_ADD |
PERMISSION_CONTROL | PERMISSION_ADMIN; PERMISSION_CONTROL | PERMISSION_ADMIN;
param = getNextConfigParam(CONF_PASSWORD, NULL); param = getNextConfigParam(CONF_PASSWORD, NULL);
if(param) { if(param) {
permission_default = 0; permission_default = 0;
do { do {
if(!strstr(param->value, PERMISSION_PASSWORD_CHAR)) { if(!strstr(param->value, PERMISSION_PASSWORD_CHAR)) {
ERROR("\"%s\" not found in password string " ERROR("\"%s\" not found in password string "
"\"%s\", line %i\n", "\"%s\", line %i\n",
PERMISSION_PASSWORD_CHAR, PERMISSION_PASSWORD_CHAR,
param->value, param->value,
param->line); param->line);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(!(temp = strtok_r(param->value, if(!(temp = strtok_r(param->value,
PERMISSION_PASSWORD_CHAR,&cp2))) { PERMISSION_PASSWORD_CHAR,&cp2))) {
ERROR("something weird just happened in permission.c\n"); ERROR("something weird just happened in permission.c\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
password = temp;
permission = malloc(sizeof(unsigned int)); password = temp;
*permission = parsePermissions(strtok_r(NULL,"",&cp2));
insertInList(permission_passwords,password,permission); permission = malloc(sizeof(unsigned int));
} while((param = getNextConfigParam(CONF_PASSWORD, param))); *permission = parsePermissions(strtok_r(NULL,"",&cp2));
insertInList(permission_passwords,password,permission);
} while((param = getNextConfigParam(CONF_PASSWORD, param)));
} }
param = getConfigParam(CONF_DEFAULT_PERMS); param = getConfigParam(CONF_DEFAULT_PERMS);
if(param) permission_default = parsePermissions(param->value); if(param) permission_default = parsePermissions(param->value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment