Changeset: dcf16524282f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dcf16524282f
Modified Files:
sql/backends/monet5/sql_user.c
sql/common/sql_backend.c
sql/common/sql_backend.h
sql/server/sql_privileges.c
sql/server/sql_privileges.h
Branch: default
Log Message:
Use bool.
diffs (111 lines):
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -352,7 +352,7 @@ parse_schema_path_str(mvc *m, str schema
}
static str
-monet5_create_user(ptr _mvc, str user, str passwd, char enc, str fullname,
sqlid schema_id, str schema_path, sqlid grantorid, lng max_memory, int
max_workers, str optimizer, sqlid role_id)
+monet5_create_user(ptr _mvc, str user, str passwd, bool enc, str fullname,
sqlid schema_id, str schema_path, sqlid grantorid, lng max_memory, int
max_workers, str optimizer, sqlid role_id)
{
mvc *m = (mvc *) _mvc;
oid rid;
@@ -566,7 +566,7 @@ monet5_schema_has_user(ptr _mvc, sql_sch
}
static int
-monet5_alter_user(ptr _mvc, str user, str passwd, char enc, sqlid schema_id,
str schema_path, str oldpasswd, sqlid
+monet5_alter_user(ptr _mvc, str user, str passwd, bool enc, sqlid schema_id,
str schema_path, str oldpasswd, sqlid
role_id)
{
mvc *m = (mvc *) _mvc;
diff --git a/sql/common/sql_backend.c b/sql/common/sql_backend.c
--- a/sql/common/sql_backend.c
+++ b/sql/common/sql_backend.c
@@ -35,7 +35,7 @@ backend_freecode(const char *mod, int cl
}
char *
-backend_create_user(ptr mvc, char *user, char *passwd, char enc, char
*fullname, sqlid defschemid, char *schema_path, sqlid grantor, lng max_memory,
int max_workers, char *optimizer, sqlid role_id)
+backend_create_user(ptr mvc, char *user, char *passwd, bool enc, char
*fullname, sqlid defschemid, char *schema_path, sqlid grantor, lng max_memory,
int max_workers, char *optimizer, sqlid role_id)
{
if (be_funcs.fcuser != NULL)
return(be_funcs.fcuser(mvc, user, passwd, enc, fullname,
defschemid, schema_path, grantor, max_memory,
@@ -75,7 +75,7 @@ backend_schema_has_user(ptr mvc, sql_sch
}
int
-backend_alter_user(ptr mvc, str user, str passwd, char enc,
+backend_alter_user(ptr mvc, str user, str passwd, bool enc,
sqlid schema_id, char *schema_path, str
oldpasswd, sqlid role_id)
{
if (be_funcs.fauser != NULL)
diff --git a/sql/common/sql_backend.h b/sql/common/sql_backend.h
--- a/sql/common/sql_backend.h
+++ b/sql/common/sql_backend.h
@@ -15,12 +15,12 @@
typedef void (*freecode_fptr) (const char *mod, int clientid, const char
*name);
-typedef char *(*create_user_fptr) (ptr mvc, char *user, char *passwd, char
enc, char *fullname, sqlid schema_id, char *schema_path, sqlid grantor_id, lng
max_memory, int max_workers, str optimizer, sqlid role_id);
+typedef char *(*create_user_fptr) (ptr mvc, char *user, char *passwd, bool
enc, char *fullname, sqlid schema_id, char *schema_path, sqlid grantor_id, lng
max_memory, int max_workers, str optimizer, sqlid role_id);
typedef int (*drop_user_fptr) (ptr mvc, char *user);
typedef oid (*find_user_fptr) (ptr mvc, char *user);
typedef void (*create_privileges_fptr) (ptr mvc, sql_schema *s, const char
*initpasswd);
typedef int (*schema_has_user_fptr) (ptr mvc, sql_schema *s);
-typedef int (*alter_user_fptr) (ptr mvc, str user, str passwd, char enc,
sqlid schema_id, char *schema_path, str oldpasswd, sqlid role_id);
+typedef int (*alter_user_fptr) (ptr mvc, str user, str passwd, bool enc,
sqlid schema_id, char *schema_path, str oldpasswd, sqlid role_id);
typedef int (*rename_user_fptr) (ptr mvc, str olduser, str newuser);
typedef void* (*schema_user_dependencies) (ptr mvc, int schema_id);
typedef void (*create_function) (ptr mvc, str name, sql_rel *rel, sql_table
*t);
@@ -50,12 +50,12 @@ typedef struct _backend_functions {
extern void backend_freecode(const char *mod, int clientid, const char *name);
-extern char *backend_create_user(ptr mvc, char *user, char *passwd, char enc,
char *fullname, sqlid defschemid, char *schema_path, sqlid grantor, lng
max_memory, int max_workers, char *optimizer, sqlid role_id);
+extern char *backend_create_user(ptr mvc, char *user, char *passwd, bool enc,
char *fullname, sqlid defschemid, char *schema_path, sqlid grantor, lng
max_memory, int max_workers, char *optimizer, sqlid role_id);
extern int backend_drop_user(ptr mvc, char *user);
extern oid backend_find_user(ptr mp, char *user);
extern void backend_create_privileges(ptr mvc, sql_schema *s, const char
*initpasswd);
extern int backend_schema_has_user(ptr mvc, sql_schema *s);
-extern int backend_alter_user(ptr mvc, str user, str passwd, char enc,
sqlid schema_id, char *schema_path, str oldpasswd, sqlid role_id);
+extern int backend_alter_user(ptr mvc, str user, str passwd, bool enc,
sqlid schema_id, char *schema_path, str oldpasswd, sqlid role_id);
extern int backend_rename_user(ptr mvc, str olduser, str newuser);
extern void* backend_schema_user_dependencies(ptr trans, sqlid schema_id);
extern int backend_resolve_function(ptr trans, sql_func *f, const char
*fimp, bool *side_effect);
diff --git a/sql/server/sql_privileges.c b/sql/server/sql_privileges.c
--- a/sql/server/sql_privileges.c
+++ b/sql/server/sql_privileges.c
@@ -775,7 +775,7 @@ mvc_set_schema(mvc *m, char *schema)
}
char *
-sql_create_user(mvc *sql, char *user, char *passwd, char enc, char *fullname,
char *schema, char *schema_path, lng max_memory, int max_workers, char
*optimizer, char *role)
+sql_create_user(mvc *sql, char *user, char *passwd, bool enc, char *fullname,
char *schema, char *schema_path, lng max_memory, int max_workers, char
*optimizer, char *role)
{
char *err;
sql_schema *s = NULL;
@@ -934,7 +934,7 @@ sql_drop_user(mvc *sql, char *user)
}
char *
-sql_alter_user(mvc *sql, char *user, char *passwd, char enc, char *schema,
char *schema_path, char *oldpasswd, char *role)
+sql_alter_user(mvc *sql, char *user, char *passwd, bool enc, char *schema,
char *schema_path, char *oldpasswd, char *role)
{
sql_schema *s = NULL;
sqlid schema_id = 0;
diff --git a/sql/server/sql_privileges.h b/sql/server/sql_privileges.h
--- a/sql/server/sql_privileges.h
+++ b/sql/server/sql_privileges.h
@@ -40,9 +40,9 @@ extern char *sql_revoke_role(mvc *m, str
extern int sql_create_privileges(mvc *m, sql_schema *s, const char
*initpasswd);
extern int sql_schema_has_user(mvc *m, sql_schema *s);
-extern char * sql_create_user(mvc *sql, char *user, char *passwd, char enc,
char *fullname, char *schema, char *schema_path, lng max_memory, int
max_workers, char *optimizer, char *default_role);
+extern char * sql_create_user(mvc *sql, char *user, char *passwd, bool enc,
char *fullname, char *schema, char *schema_path, lng max_memory, int
max_workers, char *optimizer, char *default_role);
extern char * sql_drop_user(mvc *sql, char *user);
-extern char * sql_alter_user(mvc *sql, char *user, char *passwd, char enc,
char *schema, char *schema_path, char *oldpasswd, char *role);
+extern char * sql_alter_user(mvc *sql, char *user, char *passwd, bool enc,
char *schema, char *schema_path, char *oldpasswd, char *role);
extern char * sql_rename_user(mvc *sql, char *olduser, char *newuser);
extern void sql_set_user_api_hooks(mvc *m);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
