diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 4ea3c869..3a573ddd 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -428,7 +428,7 @@ static int extract_single_file(struct archive *archive,
 				}
 			}
 		}
-		/* else if(S_ISLNK(entrymode)) { */
+		/* else if(S_ISLNK(entrymode)) */
 		/* case 5,8: don't need to do anything special */
 	}
 
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 350df6b8..7b7d1097 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -593,7 +593,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
 			          missdepstring, miss->target);
 			free(missdepstring);
 			if(data) {
-				MALLOC(miss, sizeof(pmdepmissing_t), 0);
+				MALLOC(miss, sizeof(pmdepmissing_t),/*nothing*/);
 				if(!miss) {
 					pm_errno = PM_ERR_MEMORY;
 					FREELIST(*data);
diff --git a/pactest/tests/pacman001.py b/pactest/tests/pacman001.py
new file mode 100644
index 00000000..d467e3f2
--- /dev/null
+++ b/pactest/tests/pacman001.py
@@ -0,0 +1,5 @@
+self.description = "Test command line option (--version)"
+
+self.args = "--version"
+
+self.addrule("PACMAN_RETCODE=2")
diff --git a/pactest/tests/pacman002.py b/pactest/tests/pacman002.py
new file mode 100644
index 00000000..c0217259
--- /dev/null
+++ b/pactest/tests/pacman002.py
@@ -0,0 +1,5 @@
+self.description = "Test command line option (--help)"
+
+self.args = "--help"
+
+self.addrule("PACMAN_RETCODE=2")
diff --git a/pactest/tests/pacman003.py b/pactest/tests/pacman003.py
new file mode 100644
index 00000000..b5275943
--- /dev/null
+++ b/pactest/tests/pacman003.py
@@ -0,0 +1,5 @@
+self.description = "Test command line option (-S --help)"
+
+self.args = "-S --help"
+
+self.addrule("PACMAN_RETCODE=2")
diff --git a/pactest/tests/pacman004.py b/pactest/tests/pacman004.py
new file mode 100644
index 00000000..d8d6b102
--- /dev/null
+++ b/pactest/tests/pacman004.py
@@ -0,0 +1,5 @@
+self.description = "Test command line option (-v)"
+
+self.args = "-v"
+
+self.addrule("PACMAN_RETCODE=1")