@@ -56,6 +56,23 @@

 #include "others.h"

 #include "scanner.h"

+static int onas_ddd_init_ht(uint32_t ht_size);

+static int onas_ddd_init_wdlt(uint64_t nwatches);

+static int onas_ddd_grow_wdlt();

+

+static int onas_ddd_watch(const char *pathname, int fan_fd, uint64_t fan_mask, int in_fd, uint64_t in_mask);

+static int onas_ddd_watch_hierarchy(const char* pathname, size_t len, int fd, uint64_t mask, uint32_t type);

+static int onas_ddd_unwatch(const char *pathname, int fan_fd, int in_fd);

+static int onas_ddd_unwatch_hierarchy(const char* pathname, size_t len, int fd, uint32_t type);

+

+static void onas_ddd_handle_in_moved_to(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask);

+static void onas_ddd_handle_in_create(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask);

+static void onas_ddd_handle_in_moved_from(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd);

+static void onas_ddd_handle_in_delete(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd);

+static void onas_ddd_handle_extra_scanning(struct ddd_thrarg *tharg, const char *pathname, int options);

+

+static void onas_ddd_exit(int sig);

+

 /* TODO: Unglobalize these. */

 static struct onas_ht *ddd_ht;

 static char **wdlt;

@@ -162,7 +179,7 @@ static int onas_ddd_watch_hierarchy(const char* pathname, size_t len, int fd, ui

 		if (wd < 0) return CL_EARG;

-		if (wd >= wdlt_len) {

+		if ((uint32_t) wd >= wdlt_len) {

 			onas_ddd_grow_wdlt();

 		}

@@ -273,9 +290,6 @@ void *onas_ddd_th(void *arg) {

 	sigset_t sigset;

 	struct sigaction act;

 	const struct optstruct *pt;

-	short int scan;

-	int sizelimit = 0, extinfo;

-	STATBUF sb;

 	uint64_t in_mask = IN_ONLYDIR | IN_MOVE | IN_DELETE | IN_CREATE;

 	fd_set rfds;

 	char buf[4096];

@@ -392,7 +406,7 @@ void *onas_ddd_th(void *arg) {

 			char *p = buf;

 			const char *path = NULL;

 			const char *child = NULL;

-			for(p; p < buf + bread; p += sizeof(struct inotify_event) + event->len) {

+			for(; p < buf + bread; p += sizeof(struct inotify_event) + event->len) {

 				event = (const struct inotify_event *) p;

 				wd = event->wd;

@@ -37,24 +37,9 @@ struct ddd_thrarg {

 	const struct cl_limits *limits;

 };

-static int onas_ddd_init_ht(uint32_t ht_size);

-static int onas_ddd_init_wdlt(uint64_t nwatches);

-static int onas_ddd_grow_wdlt();

-

-static int onas_ddd_watch(const char *pathname, int fan_fd, uint64_t fan_mask, int in_fd, uint64_t in_mask);

-static int onas_ddd_watch_hierarchy(const char* pathname, size_t len, int fd, uint64_t mask, uint32_t type);

-static int onas_ddd_unwatch(const char *pathname, int fan_fd, int in_fd);

-static int onas_ddd_unwatch_hierarchy(const char* pathname, size_t len, int fd, uint32_t type);

-

-static void onas_ddd_handle_in_moved_to(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask);

-static void onas_ddd_handle_in_create(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask);

-static void onas_ddd_handle_in_moved_from(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd);

-static void onas_ddd_handle_in_delete(struct ddd_thrarg *tharg, const char *path, const char *child_path, const struct inotify_event *event, int wd);

-static void onas_ddd_handle_extra_scanning(struct ddd_thrarg *tharg, const char *pathname, int options);

 int onas_ddd_init(uint64_t nwatches, size_t ht_size);

 void *onas_ddd_th(void *arg);

-static void onas_ddd_exit(int sig);

 #endif

@@ -76,7 +76,6 @@ static int onas_fan_scanfile(int fan_fd, const char *fname, struct fanotify_even

 	struct cb_context context;

 	const char *virname;

 	int ret = 0;

-	struct thrarg *dummy = tharg;

     res.fd = fmd->fd;

     res.response = FAN_ALLOW;

@@ -52,7 +52,16 @@

 #include "others.h"

 #include "scanner.h"

+static struct onas_bucket *onas_bucket_init();

+static void onas_free_bucket(struct onas_bucket *bckt);

+static int onas_bucket_insert(struct onas_bucket *bckt, struct onas_element *elem);

+static int onas_bucket_remove(struct onas_bucket *bckt, struct onas_element *elem);

+static int onas_add_hashnode_child(struct onas_hnode *node, const char* dirname);

+

+static struct onas_lnode *onas_listnode_init(void);

+

+static struct onas_hnode *onas_hashnode_init(void);

 static inline uint32_t onas_hshift(uint32_t hash) {

@@ -72,7 +81,7 @@ static inline uint32_t onas_hshift(uint32_t hash) {

 static inline int onas_hash(const char* key, size_t keylen, uint32_t size) {

 	uint32_t hash = 1;

-	int i;

+	uint32_t i;

 	for (i = 0; i < keylen; i++) {

 		hash += key[i];

@@ -112,7 +121,7 @@ void onas_free_ht(struct onas_ht *ht) {

 		return;

 	}

-	int i = 0;

+	uint32_t i = 0;

 	for (i = 0; i < ht->size; i++) {

 		onas_free_bucket(ht->htable[i]);

 		ht->htable[i] = NULL;

@@ -144,7 +153,7 @@ static void onas_free_bucket(struct onas_bucket *bckt) {

 	if (!bckt) return;

-	int i = 0;

+	uint32_t i = 0;

 	struct onas_element *curr = NULL;

 	for (i = 0; i < bckt->size; i++) {

@@ -197,7 +206,7 @@ int onas_ht_insert(struct onas_ht *ht, struct onas_element *elem) {

 	struct onas_bucket *bckt = ht->htable[idx];

 	int ret = 0;

-	int bsize = 0;

+	uint32_t bsize = 0;

 	if (bckt == NULL) {

 		ht->htable[idx] = onas_bucket_init();

@@ -324,7 +333,7 @@ static int onas_bucket_remove(struct onas_bucket *bckt, struct onas_element *ele

 /* Dealing with hash nodes and list nodes */

 /* Function to initialize hashnode. */

-struct onas_hnode *onas_hashnode_init() {

+static struct onas_hnode *onas_hashnode_init(void) {

 	struct onas_hnode *hnode = NULL;

 	if(!(hnode = (struct onas_hnode *) cli_malloc(sizeof(struct onas_hnode)))) {

 		return NULL;

@@ -358,7 +367,7 @@ struct onas_hnode *onas_hashnode_init() {

 }

 /* Function to initialize listnode. */

-struct onas_lnode *onas_listnode_init() {

+static struct onas_lnode *onas_listnode_init(void) {

 	struct onas_lnode *lnode = NULL;

 	if(!(lnode = (struct onas_lnode *) cli_malloc(sizeof(struct onas_lnode)))) {

 		return NULL;

@@ -458,7 +467,7 @@ int onas_rm_listnode(struct onas_lnode *head, const char *dirname) {

 	struct onas_lnode *curr = head;

 	size_t n = strlen(dirname);

-	while (curr = curr->next) {

+	while ((curr = curr->next)) {

 		if (!strncmp(curr->dirname, dirname, n)) {

 			struct onas_lnode *tmp = curr->prev;

 			tmp->next = curr->next;

@@ -532,7 +541,7 @@ int onas_ht_rm_child(struct onas_ht *ht, const char *prntpath, size_t prntlen, c

 	hnode = elem->data;

-	if (ret = onas_rm_listnode(hnode->childhead, &(childpath[idx]))) return CL_EARG;

+	if ((ret = onas_rm_listnode(hnode->childhead, &(childpath[idx])))) return CL_EARG;

 	return CL_SUCCESS;

 }

@@ -570,13 +579,13 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname) {

 	if (prnt) onas_ht_add_child(ht, prnt, strlen(prnt), pathname, len);

 	free(prnt);

-	char * const pathargv[] = { pathname, NULL };

+	char * const pathargv[] = { (char*) pathname, NULL };

 	if (!(ftsp = fts_open(pathargv, ftspopts, NULL))) {

 		logg("!ScanOnAccess: Could not open '%s'\n", pathname);

 		return CL_EARG;

 	}

-	while(curr = fts_read(ftsp)) {

+	while((curr = fts_read(ftsp))) {

 		struct onas_hnode *hnode = NULL;

@@ -599,7 +608,7 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname) {

 				continue;

 		}

-		if(childlist = fts_children(ftsp, 0)) {

+		if((childlist = fts_children(ftsp, 0))) {

 			do {

 				if (childlist->fts_info & FTS_D &&

 				    !(childlist->fts_info & FTS_DNR) &&

@@ -608,7 +617,7 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname) {

 						return CL_EMEM;

 				}

-			} while (childlist = childlist->fts_link);

+			} while ((childlist = childlist->fts_link));

 		}

 		struct onas_element *elem = onas_element_init(hnode, hnode->pathname, hnode->pathlen);

@@ -97,20 +97,12 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname);

 int onas_ht_add_child(struct onas_ht *ht, const char *prntpath, size_t prntlen, const char *childpath, size_t childlen);

 int onas_ht_rm_child(struct onas_ht *ht, const char *prntpath, size_t prntlen, const char *childpath, size_t childlen);

-static struct onas_bucket *onas_bucket_init();

-static void onas_free_bucket(struct onas_bucket *bckt);

-static int onas_bucket_insert(struct onas_bucket *bckt, struct onas_element *elem);

-static int onas_bucket_remove(struct onas_bucket *bckt, struct onas_element *elem);

-

 void onas_free_element(struct onas_element *elem);

 struct onas_element *onas_element_init(struct onas_hnode *value, const char *key, size_t klen);

 void onas_free_hashnode(struct onas_hnode *hnode);

-struct onas_hnode *onas_hashnode_init();

-static int onas_add_hashnode_child(struct onas_hnode *node, const char* dirname);

 void onas_free_listnode(struct onas_lnode *lnode);

-struct onas_lnode *onas_listnode_init();

 int onas_add_listnode(struct onas_lnode *tail, struct onas_lnode *node);

 int onas_rm_listnode(struct onas_lnode *head, const char *dirname);

@@ -39,6 +39,11 @@

 #include "onaccess_scth.h"

+static void onas_scth_handle_dir(const char *pathname);

+static void onas_scth_handle_file(const char *pathname);

+

+static void onas_scth_exit(int sig);

+

 static void onas_scth_exit(int sig) {

 	logg("*ScanOnAccess: onas_scth_exit(), signal %d\n", sig);

@@ -50,11 +55,11 @@ static void onas_scth_handle_dir(const char *pathname) {

 	int ftspopts = FTS_PHYSICAL | FTS_XDEV;

 	FTSENT *curr = NULL;

-	char *const pathargv[] = { pathname, NULL };

+	char *const pathargv[] = { (char *) pathname, NULL };

 	if (!(ftsp = fts_open(pathargv, ftspopts, NULL))) return;

 	/* Offload scanning work to fanotify thread to avoid potential deadlocks. */

-	while (curr = fts_read(ftsp)) {

+	while ((curr = fts_read(ftsp))) {

 		if (curr->fts_info != FTS_D) {

 			int fd = open(curr->fts_path, O_RDONLY);

 			if (fd > 0) close(fd);

@@ -79,8 +84,6 @@ void *onas_scan_th(void *arg) {

 	struct scth_thrarg *tharg = (struct scth_thrarg *) arg;

 	sigset_t sigset;

 	struct sigaction act;

-	const struct optstruct *pt;

-	short int scan;

 	/* ignore all signals except SIGUSR1 */

 	sigfillset(&sigset);

@@ -27,13 +27,9 @@

 struct scth_thrarg {

 	int options;

 	const struct optstruct *opts;

-	const char *pathname;

+	char *pathname;

 };

-static void onas_scth_handle_dir(const char *pathname);

-static void onas_scth_handle_file(const char *pathname);

-

 void *onas_scan_th(void *arg);

-static void onas_scth_exit(int sig);

 #endif