Re: svn commit: r361685 - head/sys/kern

2020-06-01 Thread Rodney W. Grimes
[ Charset UTF-8 unsupported, converting... ]
> Author: peter
> Date: Mon Jun  1 03:37:58 2020
> New Revision: 361685
> URL: https://svnweb.freebsd.org/changeset/base/361685
> 
> Log:
>   Clarify which hints file is the source of an error message.

Better correction could be to use the variable storing the name
that is used.

>   
>   PR: 246688
>   Submitted by:   Ashish Gupta 
>   MFC after:  1 week
> 
> Modified:
>   head/sys/kern/kern_linker.c
> 
> Modified: head/sys/kern/kern_linker.c
> ==
> --- head/sys/kern/kern_linker.c   Mon Jun  1 02:54:10 2020
> (r361684)
> +++ head/sys/kern/kern_linker.c   Mon Jun  1 03:37:58 2020
> (r361685)
> @@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con
>* XXX: we need to limit this number to some reasonable value
>*/
>   if (vattr.va_size > LINKER_HINTS_MAX) {
> - printf("hints file too large %ld\n", (long)vattr.va_size);
> + printf("linker.hints file too large %ld\n", 
> (long)vattr.va_size);

+   printf("%s file too large %ld\n", linker_hintfile, 
(long)vattr.va_size);

>   goto bad;
>   }
>   hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
> @@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con
>   intp = (int *)hints;
>   ival = *intp++;
>   if (ival != LINKER_HINTS_VERSION) {
> - printf("hints file version mismatch %d\n", ival);
> + printf("linker.hints file version mismatch %d\n", ival);

Ditto.

>   goto bad;
>   }
>   bufend = hints + vattr.va_size;
> 

-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r361685 - head/sys/kern

2020-05-31 Thread Peter Wemm
Author: peter
Date: Mon Jun  1 03:37:58 2020
New Revision: 361685
URL: https://svnweb.freebsd.org/changeset/base/361685

Log:
  Clarify which hints file is the source of an error message.
  
  PR:   246688
  Submitted by: Ashish Gupta 
  MFC after:1 week

Modified:
  head/sys/kern/kern_linker.c

Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Mon Jun  1 02:54:10 2020(r361684)
+++ head/sys/kern/kern_linker.c Mon Jun  1 03:37:58 2020(r361685)
@@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con
 * XXX: we need to limit this number to some reasonable value
 */
if (vattr.va_size > LINKER_HINTS_MAX) {
-   printf("hints file too large %ld\n", (long)vattr.va_size);
+   printf("linker.hints file too large %ld\n", 
(long)vattr.va_size);
goto bad;
}
hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
@@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con
intp = (int *)hints;
ival = *intp++;
if (ival != LINKER_HINTS_VERSION) {
-   printf("hints file version mismatch %d\n", ival);
+   printf("linker.hints file version mismatch %d\n", ival);
goto bad;
}
bufend = hints + vattr.va_size;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"