svn commit: r245638 - in projects/efika_mx: bin/ps sys/contrib/dev/acpica/components/disassembler usr.bin/w

[Aleksandr Rybalko]

Author: ray
Date: Sat Jan 19 00:52:06 2013
New Revision: 245638
URL: http://svnweb.freebsd.org/changeset/base/245638

Log:
  MFC @r245636.

Modified:
  projects/efika_mx/bin/ps/fmt.c
  projects/efika_mx/bin/ps/ps.c
  projects/efika_mx/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  projects/efika_mx/usr.bin/w/w.c
Directory Properties:
  projects/efika_mx/   (props changed)
  projects/efika_mx/sys/   (props changed)
  projects/efika_mx/sys/contrib/dev/acpica/   (props changed)
  projects/efika_mx/sys/contrib/dev/acpica/components/disassembler/   (props changed)

Modified: projects/efika_mx/bin/ps/fmt.c
==============================================================================
--- projects/efika_mx/bin/ps/fmt.c	Sat Jan 19 00:50:12 2013	(r245637)
+++ projects/efika_mx/bin/ps/fmt.c	Sat Jan 19 00:52:06 2013	(r245638)
@@ -123,7 +123,7 @@ fmt_argv(char **argv, char *cmd, char *t
 	if (cp == NULL)
 		errx(1, "malloc failed");
 	if (ap == NULL) {
-		if (showthreads && thread != NULL) {
+		if (thread != NULL) {
 			asprintf(&ap, "%s/%s", cmd, thread);
 			sprintf(cp, "[%.*s]", (int)maxlen, ap);
 			free(ap);

Modified: projects/efika_mx/bin/ps/ps.c
==============================================================================
--- projects/efika_mx/bin/ps/ps.c	Sat Jan 19 00:50:12 2013	(r245637)
+++ projects/efika_mx/bin/ps/ps.c	Sat Jan 19 00:52:06 2013	(r245638)
@@ -1168,7 +1168,7 @@ fmt(char **(*fn)(kvm_t *, const struct k
 	const char *s;
 
 	s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm,
-	    ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen);
+	    showthreads && ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen);
 	return (s);
 }
 

Modified: projects/efika_mx/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
==============================================================================
--- projects/efika_mx/sys/contrib/dev/acpica/components/disassembler/dmresrc.c	Sat Jan 19 00:50:12 2013	(r245637)
+++ projects/efika_mx/sys/contrib/dev/acpica/components/disassembler/dmresrc.c	Sat Jan 19 00:52:06 2013	(r245638)
@@ -416,7 +416,7 @@ AcpiDmIsResourceTemplate (
     /* Walk the byte list, abort on any invalid descriptor type or length */
 
     Status = AcpiUtWalkAmlResources (WalkState, Aml, Length,
-        NULL, (void **) &EndAml);
+        NULL, ACPI_CAST_INDIRECT_PTR (void, &EndAml));
     if (ACPI_FAILURE (Status))
     {
         return (AE_TYPE);

Modified: projects/efika_mx/usr.bin/w/w.c
==============================================================================
--- projects/efika_mx/usr.bin/w/w.c	Sat Jan 19 00:50:12 2013	(r245637)
+++ projects/efika_mx/usr.bin/w/w.c	Sat Jan 19 00:52:06 2013	(r245638)
@@ -123,7 +123,7 @@ static struct stat	*ttystat(char *);
 static void		 usage(int);
 static int		 this_is_uptime(const char *s);
 
-char *fmt_argv(char **, char *, int);	/* ../../bin/ps/fmt.c */
+char *fmt_argv(char **, char *, char *, size_t);	/* ../../bin/ps/fmt.c */
 
 int
 main(int argc, char *argv[])
@@ -320,7 +320,7 @@ main(int argc, char *argv[])
 			continue;
 		}
 		ep->args = fmt_argv(kvm_getargv(kd, ep->kp, argwidth),
-		    ep->kp->ki_comm, MAXCOMLEN);
+		    ep->kp->ki_comm, NULL, MAXCOMLEN);
 		if (ep->args == NULL)
 			err(1, NULL);
 	}
@@ -404,7 +404,7 @@ main(int argc, char *argv[])
 				const char *ptr;
 
 				ptr = fmt_argv(kvm_getargv(kd, dkp, argwidth),
-				    dkp->ki_comm, MAXCOMLEN);
+				    dkp->ki_comm, NULL, MAXCOMLEN);
 				if (ptr == NULL)
 					ptr = "-";
 				(void)printf("\t\t%-9d %s\n",