Code linting

Makefile.am

@@ -43,7 +43,7 @@ endif # CHECK
 if HAVE_CPPCHECK
 LINT += cppcheck
 cppcheck:
-	$(CPPCHECK) --enable=all --inline-suppr --check-config --suppress=missingIncludeSystem -q $(top_builddir)/src -I $(top_builddir)/src/
+	$(CPPCHECK) --enable=all --inline-suppr --suppress=missingIncludeSystem -q $(top_builddir)/src -I $(top_builddir)/src/
 endif # HAVE_CPPCHECK
 
 checks: $(ALL_CHECKS)

src/asm_env.c

@@ -505,6 +505,7 @@ static char *asmsh_env_tmpexec()
 		errno = err;
 		return NULL;
 	}
+	// cppcheck-suppress comparePointers
 	const int sz = &_binary_child_end - &_binary_child_start;
 	int rsz = write(tmpfd, &_binary_child_start, sz);
 	if(rsz<sz)

src/asmsh.c

@@ -42,7 +42,7 @@ void help(const char *argv0)
 	for(size_t i=0; long_opts[i].name; i++)
 	{
 		const struct option *opt = &long_opts[i];
-		const char *help = help_opts[i];
+		const char *helptext = help_opts[i];
 		printf("\t");
 		if(opt->val)
 		{
@@ -51,7 +51,7 @@ void help(const char *argv0)
 		printf("--%s%s\n",
 				opt->name,
 				opt->has_arg==0?"":(opt->has_arg==1?"arg":"[arg]"));
-		printf("\t\t%s\n", help);
+		printf("\t\t%s\n", helptext);
 	}
 
 }
@@ -146,5 +146,7 @@ int main(int argc, char *argv[], char *envp[])
 	save_history(hpath, hstr);
 	free(hpath);
 
+	asmsh_logger_free(logger);
+
 	return ret;
 }

src/breakpoints.c

@@ -138,7 +138,7 @@ int asmsh_brk_isset(asmsh_brk_t *brks, unsigned long addr)
 
 static int asmsh_brk_index(asmsh_brk_t *brks, unsigned long addr, size_t *idx)
 {
-	size_t beg, end, mid;
+	size_t beg, end;
 
 	if(brks->sz == 0)
 	{
@@ -151,6 +151,7 @@ static int asmsh_brk_index(asmsh_brk_t *brks, unsigned long addr, size_t *idx)
 	
 	while(end >= beg)
 	{
+		size_t mid;
 		mid = (beg + end)  / 2;
 		if(brks->addrs[mid] == addr)
 		{

src/compile.c

@@ -514,12 +514,10 @@ static int text_section_informations(const int fd,
 {
 	const int off_section_off = 0x18;
 
-	off_t off;
-	ssize_t rret;
 	int err;
 	unsigned long int strtab_offset, strtab_sz;
 
-	if((off = lseek(fd, strtab_section_offset + off_section_off, SEEK_SET)) != \
+	if(lseek(fd, strtab_section_offset + off_section_off, SEEK_SET) != \
 			strtab_section_offset + off_section_off)
 	{
 		err=errno;
@@ -527,14 +525,14 @@ static int text_section_informations(const int fd,
 		errno = err;
 		return -1;
 	}
-	if((rret = read(fd, &strtab_offset, 8)) != 8)
+	if(read(fd, &strtab_offset, 8) != 8)
 	{
 		err=errno;
 		asmsh_log_perror("Unable to read strtab offset");
 		errno = err;
 		return -1;
 	}
-	if((rret = read(fd, &strtab_sz, 8)) != 8)
+	if(read(fd, &strtab_sz, 8) != 8)
 	{
 		err=errno;
 		asmsh_log_perror("Unable to read strtab size");
@@ -543,14 +541,14 @@ static int text_section_informations(const int fd,
 	}
 
 	char strtab[strtab_sz];
-	if((off = lseek(fd, strtab_offset, SEEK_SET)) != strtab_offset)
+	if(lseek(fd, strtab_offset, SEEK_SET) != strtab_offset)
 	{
 		err=errno;
 		asmsh_log_perror("Unable to seek at strtab");
 		errno = err;
 		return -1;
 	}
-	if((rret = read(fd, strtab, strtab_sz)) != strtab_sz)
+	if(read(fd, strtab, strtab_sz) != strtab_sz)
 	{
 		err=errno;
 		asmsh_log_perror("Unable to read strtab");
@@ -562,7 +560,7 @@ static int text_section_informations(const int fd,
 	for(unsigned short i=0; i<section_header_count; i++)
 	{
 		unsigned long int cur_off = section_header_off + i*section_header_sz;
-		if((off = lseek(fd, cur_off, SEEK_SET)) != cur_off)
+		if(lseek(fd, cur_off, SEEK_SET) != cur_off)
 		{
 			err=errno;
 			asmsh_log_perror("Unable to seek section");
@@ -570,7 +568,7 @@ static int text_section_informations(const int fd,
 			return -1;
 		}
 		unsigned int name_off;
-		if((rret = read(fd, &name_off, 4)) != 4)
+		if(read(fd, &name_off, 4) != 4)
 		{
 			err=errno;
 			asmsh_log_perror("Unable to read section's name offset");
@@ -593,7 +591,7 @@ static int text_section_informations(const int fd,
 			continue;
 		}
 		unsigned int type;
-		if((rret = read(fd, &type, 4)) != 4)
+		if(read(fd, &type, 4) != 4)
 		{
 			err=errno;
 			asmsh_log_perror("Unable to read section type");
@@ -607,7 +605,7 @@ static int text_section_informations(const int fd,
 			return -1;
 		}
 
-		if((off = lseek(fd, cur_off + off_section_off, SEEK_SET)) != \
+		if(lseek(fd, cur_off + off_section_off, SEEK_SET) != \
 				cur_off + off_section_off)
 		{
 			err=errno;
@@ -616,14 +614,14 @@ static int text_section_informations(const int fd,
 			return -1;
 		}
 
-		if((rret = read(fd, text_off, 8)) != 8)
+		if(read(fd, text_off, 8) != 8)
 		{
 			err=errno;
 			asmsh_log_perror("Unable to read .text section offset");
 			errno = err;
 			return -1;
 		}
-		if((rret = read(fd, text_sz, 8)) != 8)
+		if(read(fd, text_sz, 8) != 8)
 		{
 			err=errno;
 			asmsh_log_perror("Unable to read .text section size");

src/completion.c

@@ -38,7 +38,6 @@ char **asmsh_completion(const char *buf, const char *text, int start, int end)
 			return NULL;
 		}
 		cmds=ptr;
-		ptr=&cmds[clen];
 		memcpy(&cmds[clen], instr, ilen*sizeof(*instr));
 		cmds[ilen+clen]=NULL;
 		return cmds;

src/shell.c

@@ -264,7 +264,7 @@ size_t asmsh_parse_labels(asmsh_t *sh, char preffix, const char *cmd,
 			return 0;
 		}
 
-		const char fmt_addr[] = ". %c 0x%lx";
+		const char fmt_addr[] = ". %c 0x%zx";
 		char sign = sym->addr > sh->env->regs.rip ? '+': '-';
 		size_t offset = sym->addr > sh->env->regs.rip ?  \
 				sym->addr - sh->env->regs.rip:\

src/shell.h

@@ -27,6 +27,10 @@
 typedef struct asmsh_s asmsh_t;
 #include "shell_sym.h"
 
+/** Structure storing all information needed to run a shell
+ * @todo Make it handle command history
+ * @todo Make it handle "modes" for function writing etc.
+ */
 struct asmsh_s
 {
 	///! Compilation context
@@ -39,6 +43,8 @@ struct asmsh_s
 	 * @deprecated
 	 */
 	char *child_path;
+
+
 	/** May store the last executed instruction ? not sure if used or not */
 	char *last_instr;
 	/** Last executed bytecode ? */

src/shell_cmd_breakpoint.c

@@ -224,7 +224,7 @@ static int brk_ls(asmsh_t *sh, asmsh_cmd_args_t *args, int expr_first)
 	{
 		printf("0x%016lx\n", sh->env->brks.addrs[i]);
 	}
-	printf("%ld breakpoints\n", sh->env->brks.sz);
+	printf("%zu breakpoints\n", sh->env->brks.sz);
 	return 0;
 }
 

src/shell_cmds.c

@@ -239,7 +239,7 @@ int asmsh_cmd_label(asmsh_t *sh, asmsh_cmd_args_t *args)
 			asmsh_log_info("Use '.label NAME [addr]' to define a label");
 			return 0;
 		}
-		printf("%3ld labels :\n", sh->env->labels.syms_sz);
+		printf("%3zu labels :\n", sh->env->labels.syms_sz);
 		for(size_t i=0; i<sh->env->labels.syms_sz; i++)
 		{
 			printf("\t%c%s\t %016lx\n",
@@ -312,7 +312,7 @@ int asmsh_cmd_maps(asmsh_t *sh, asmsh_cmd_args_t *args)
 	for(int i=0; i<sh->env->mmap.size; i++)
 	{
 		const child_mmap_t *m = &sh->env->mmap.maps[i];
-		printf("%012llx-%012llx %c%c%c  %08lx  %02lx:%02lx %10lu %s\n",
+		printf("%012llx-%012llx %c%c%c  %08zx  %02lx:%02lx %10lu %s\n",
 				(unsigned long long int)m->start,
 				(unsigned long long int)m->stop,
 				m->perm & PROT_READ ?'r':'-',
@@ -401,7 +401,7 @@ int asmsh_cmd_syscalls(asmsh_t *sh, asmsh_cmd_args_t *args)
 	printed = 0;
 	for(int i=0; i<sz; i++)
 	{
-		int ret = snprintf(buf, 512, "%3d 0x%03x %20s ",
+		int ret = snprintf(buf, 512, "%3u 0x%03x %20s ",
 			syscall_infos[i].nr,
 			syscall_infos[i].nr,
 			syscall_infos[i].name);