Merge remote-tracking branch 'sami/to-craig' into sami-merge

Conflicts: pgrep.c w.c
2012-03-03 13:56:32 +11:00
parent cda4b65add 96e86ef1a0
commit 502a79e02f
10 changed files with 83 additions and 17 deletions
--- a/pgrep.c
+++ b/pgrep.c
@ -798,9 +798,9 @@ int main (int argc, char **argv)
 				continue;
 			}
 			if (errno==ESRCH)
-				 /* gone now, which is OK */
-				continue;
-			xwarn(_("killing pid %d failed"), procs[i].num);
+				 // gone now, which is OK
+			        continue;
+			xwarn(_("killing pid %ld failed"), procs[i].num);
 		}
 	} else {
 		if (opt_count) {