constantify su_context* arg & small cosmetic fixes

git-core · git-core · commit 33529968515e · 2012-01-29T22:00:27.000+04:00
diff --git a/activity.cpp b/activity.cpp
@@ -44,7 +44,7 @@ static const int VAL_INTEGER = 1;
 
 static const int START_SUCCESS = 0;
 
-int send_intent(struct su_context *ctx,
+int send_intent(const struct su_context *ctx,
                 const char *socket_path, int allow, const char *action)
 {
     sp<IServiceManager> sm = defaultServiceManager();
diff --git a/db.c b/db.c
@@ -23,9 +23,7 @@
 
 #include "su.h"
 
-// { int* pint; pint=(int*)data; ++(*pint); }
-
-static sqlite3 *db_init()
+static sqlite3 *db_init(void)
 {
     sqlite3 *db;
     int rc;
@@ -41,7 +39,7 @@ static sqlite3 *db_init()
     return db;
 }
 
-static int db_check(sqlite3 *db, struct su_context *ctx)
+static int db_check(sqlite3 *db, const struct su_context *ctx)
 {
     char sql[4096];
     char *zErrmsg;
@@ -86,7 +84,7 @@ static int db_check(sqlite3 *db, struct su_context *ctx)
     return allow;
 }
 
-int database_check(struct su_context *ctx)
+int database_check(const struct su_context *ctx)
 {
     sqlite3 *db;
     int dballow;
diff --git a/su.c b/su.c
@@ -196,7 +196,7 @@ static int socket_accept(int serv_fd)
     return fd;
 }
 
-static int socket_send_request(int fd, struct su_context *ctx)
+static int socket_send_request(int fd, const struct su_context *ctx)
 {
     size_t len;
     size_t bin_size, cmd_size;
@@ -268,7 +268,7 @@ static void usage(int status)
     exit(status);
 }
 
-static void deny(struct su_context *ctx)
+static void deny(const struct su_context *ctx)
 {
     char *cmd = get_command(&ctx->to);
 
@@ -278,7 +278,7 @@ static void deny(struct su_context *ctx)
     exit(EXIT_FAILURE);
 }
 
-static void allow(struct su_context *ctx)
+static void allow(const struct su_context *ctx)
 {
     char *arg0;
     int argc, err;
diff --git a/su.h b/su.h
@@ -78,26 +78,26 @@ enum {
     DB_ALLOW
 };
 
-extern int database_check(struct su_context *ctx);
+extern int database_check(const struct su_context *ctx);
 
-extern int send_intent(struct su_context *ctx,
+extern int send_intent(const struct su_context *ctx,
                        const char *socket_path, int allow, const char *action);
 
-static inline char *get_command(struct su_request *to)
+static inline char *get_command(const struct su_request *to)
 {
 	return (to->command) ? to->command : to->shell;
 }
 
 #if 0
 #undef LOGE
-#define LOGE(fmt,args...) fprintf(stderr, fmt , ## args )
+#define LOGE(fmt,args...) fprintf(stderr, fmt, ##args)
 #undef LOGD
-#define LOGD(fmt,args...) fprintf(stderr, fmt , ## args )
+#define LOGD(fmt,args...) fprintf(stderr, fmt, ##args)
 #undef LOGW
-#define LOGW(fmt,args...) fprintf(stderr, fmt , ## args )
+#define LOGW(fmt,args...) fprintf(stderr, fmt, ##args)
 #endif
 
-#define PLOGE(fmt,args...) LOGE(fmt " failed with %d: %s" , ## args , errno, strerror(errno))
-#define PLOGEV(fmt,err,args...) LOGE(fmt " failed with %d: %s" , ## args , err, strerror(err))
+#define PLOGE(fmt,args...) LOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno))
+#define PLOGEV(fmt,err,args...) LOGE(fmt " failed with %d: %s", ##args, err, strerror(err))
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ static const int VAL_INTEGER = 1;`
`44`	`44`
`45`	`45`	`static const int START_SUCCESS = 0;`
`46`	`46`
`47`		`-int send_intent(struct su_context *ctx,`
	`47`	`+int send_intent(const struct su_context *ctx,`
`48`	`48`	`const char socket_path, int allow, const char action)`
`49`	`49`	`{`
`50`	`50`	`sp<IServiceManager> sm = defaultServiceManager();`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@`
`23`	`23`
`24`	`24`	`#include "su.h"`
`25`	`25`
`26`		`-// { int* pint; pint=(int)data; ++(pint); }`
`27`		`-`
`28`		`-static sqlite3 *db_init()`
	`26`	`+static sqlite3 *db_init(void)`
`29`	`27`	`{`
`30`	`28`	`sqlite3 *db;`
`31`	`29`	`int rc;`
`@@ -41,7 +39,7 @@ static sqlite3 *db_init()`
`41`	`39`	`return db;`
`42`	`40`	`}`
`43`	`41`
`44`		`-static int db_check(sqlite3 db, struct su_context ctx)`
	`42`	`+static int db_check(sqlite3 db, const struct su_context ctx)`
`45`	`43`	`{`
`46`	`44`	`char sql[4096];`
`47`	`45`	`char *zErrmsg;`
`@@ -86,7 +84,7 @@ static int db_check(sqlite3 db, struct su_context ctx)`
`86`	`84`	`return allow;`
`87`	`85`	`}`
`88`	`86`
`89`		`-int database_check(struct su_context *ctx)`
	`87`	`+int database_check(const struct su_context *ctx)`
`90`	`88`	`{`
`91`	`89`	`sqlite3 *db;`
`92`	`90`	`int dballow;`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ static int socket_accept(int serv_fd)`
`196`	`196`	`return fd;`
`197`	`197`	`}`
`198`	`198`
`199`		`-static int socket_send_request(int fd, struct su_context *ctx)`
	`199`	`+static int socket_send_request(int fd, const struct su_context *ctx)`
`200`	`200`	`{`
`201`	`201`	`size_t len;`
`202`	`202`	`size_t bin_size, cmd_size;`
`@@ -268,7 +268,7 @@ static void usage(int status)`
`268`	`268`	`exit(status);`
`269`	`269`	`}`
`270`	`270`
`271`		`-static void deny(struct su_context *ctx)`
	`271`	`+static void deny(const struct su_context *ctx)`
`272`	`272`	`{`
`273`	`273`	`char *cmd = get_command(&ctx->to);`
`274`	`274`
`@@ -278,7 +278,7 @@ static void deny(struct su_context *ctx)`
`278`	`278`	`exit(EXIT_FAILURE);`
`279`	`279`	`}`
`280`	`280`
`281`		`-static void allow(struct su_context *ctx)`
	`281`	`+static void allow(const struct su_context *ctx)`
`282`	`282`	`{`
`283`	`283`	`char *arg0;`
`284`	`284`	`int argc, err;`