Fixed printf format errors.

This commit is contained in:
Bruce Evans 1998-06-30 20:48:45 +00:00
parent 2512f2fe3b
commit 09d693f205
10 changed files with 51 additions and 32 deletions

View File

@ -496,7 +496,7 @@ kvm_open (efile, cfile, sfile, perm, errout)
}
physrd (cfd, ksym_lookup ("IdlePTD") - KERNOFF, (char*)&sbr, sizeof sbr);
printf ("IdlePTD %x\n", sbr);
printf ("IdlePTD %lu\n", (unsigned long)sbr);
curpcb = ksym_lookup ("curpcb") - KERNOFF;
physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb);
@ -506,7 +506,7 @@ kvm_open (efile, cfile, sfile, perm, errout)
else
paddr = kvtophys (cfd, curpcb);
read_pcb (cfd, paddr);
printf ("initial pcb at %x\n", paddr);
printf ("initial pcb at %lx\n", (unsigned long)paddr);
return (cfd);
}

View File

@ -496,7 +496,7 @@ kvm_open (efile, cfile, sfile, perm, errout)
}
physrd (cfd, ksym_lookup ("IdlePTD") - KERNOFF, (char*)&sbr, sizeof sbr);
printf ("IdlePTD %x\n", sbr);
printf ("IdlePTD %lu\n", (unsigned long)sbr);
curpcb = ksym_lookup ("curpcb") - KERNOFF;
physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb);
@ -506,7 +506,7 @@ kvm_open (efile, cfile, sfile, perm, errout)
else
paddr = kvtophys (cfd, curpcb);
read_pcb (cfd, paddr);
printf ("initial pcb at %x\n", paddr);
printf ("initial pcb at %lx\n", (unsigned long)paddr);
return (cfd);
}

View File

@ -496,7 +496,7 @@ kvm_open (efile, cfile, sfile, perm, errout)
}
physrd (cfd, ksym_lookup ("IdlePTD") - KERNOFF, (char*)&sbr, sizeof sbr);
printf ("IdlePTD %x\n", sbr);
printf ("IdlePTD %lu\n", (unsigned long)sbr);
curpcb = ksym_lookup ("curpcb") - KERNOFF;
physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb);
@ -506,7 +506,7 @@ kvm_open (efile, cfile, sfile, perm, errout)
else
paddr = kvtophys (cfd, curpcb);
read_pcb (cfd, paddr);
printf ("initial pcb at %x\n", paddr);
printf ("initial pcb at %lx\n", (unsigned long)paddr);
return (cfd);
}

View File

@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c 6.10 (Berkeley) 5/22/91";
Set, indirect, and warning symbol features added by Randy Smith. */
/*
* $Id: ld.c,v 1.44 1997/04/25 19:43:19 bde Exp $
* $Id: ld.c,v 1.45 1997/05/13 10:23:46 dfr Exp $
*/
/* Define how to initialize system-dependent header fields. */
@ -3495,8 +3495,8 @@ write_syms()
nl.n_type = sp->defined;
if (nl.n_type == (N_INDR|N_EXT) &&
sp->value != 0)
errx(1, "%s: N_INDR has value %#x",
demangle(sp->name), sp->value);
errx(1, "%s: N_INDR has value %#lx",
demangle(sp->name), sp->value);
nl.n_value = sp->value;
if (sp->def_lsp)
bind = N_BIND(&sp->def_lsp->nzlist.nlist);
@ -3596,7 +3596,7 @@ printf("writesym(#%d): %s, type %x\n", syms_written, demangle(sp->name), sp->def
if (symtab_offset + symtab_len != strtab_offset)
errx(1,
"internal error: inconsistent symbol table length: %d vs %s",
"internal error: inconsistent symbol table length: %d vs %d",
symtab_offset + symtab_len, strtab_offset);
if (fseek(outstream, strtab_offset, SEEK_SET) != 0)

View File

@ -30,7 +30,7 @@
Set, indirect, and warning symbol features added by Randy Smith. */
/*
* $Id$ - library routines
* $Id: lib.c,v 1.21 1997/02/22 15:46:22 peter Exp $ - library routines
*/
#include <sys/param.h>
@ -130,7 +130,7 @@ decode_library_subfile(fd, library_entry, subfile_offset, length_loc)
if (sscanf(hdr1.ar_size, "%d", &member_length) != 1)
errx(1, "%s: malformatted header of archive member: %.*s",
get_file_name(library_entry),
sizeof(hdr1.ar_name), hdr1.ar_name);
(int)sizeof(hdr1.ar_name), hdr1.ar_name);
subentry = (struct file_entry *) xmalloc(sizeof(struct file_entry));
bzero(subentry, sizeof(struct file_entry));
@ -157,7 +157,7 @@ decode_library_subfile(fd, library_entry, subfile_offset, length_loc)
if (read(fd, name, namelen) != namelen)
errx(1, "%s: malformatted archive member: %.*s",
get_file_name(library_entry),
sizeof(hdr1.ar_name), hdr1.ar_name);
(int)sizeof(hdr1.ar_name), hdr1.ar_name);
name[namelen] = 0;
content_length -= namelen;
starting_offset += namelen;

View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: rrs.c,v 1.21 1997/04/25 15:26:12 jdp Exp $
* $Id: rrs.c,v 1.22 1997/05/13 10:23:47 dfr Exp $
*/
#include <sys/param.h>
@ -534,7 +534,7 @@ claim_rrs_internal_gotslot(entry, rp, lsp, addend)
if (lsp->gotslot_offset != -1) {
/* Already claimed */
if (*GOTP(lsp->gotslot_offset) != addend)
errx(1, "%s: gotslot at %#x is multiple valued",
errx(1, "%s: gotslot at %#lx is multiple valued",
get_file_name(entry), lsp->gotslot_offset);
return lsp->gotslot_offset;
}

View File

@ -30,7 +30,7 @@
Set, indirect, and warning symbol features added by Randy Smith. */
/*
* $Id$
* $Id: warnings.c,v 1.15 1997/02/22 15:46:27 peter Exp $
*/
#include <sys/param.h>
@ -185,10 +185,14 @@ describe_file_sections(entry, outfile)
if (entry->flags & (E_JUST_SYMS | E_DYNAMIC))
fprintf(outfile, " symbols only\n");
else
fprintf(outfile, " text %x(%lx), data %x(%lx), bss %x(%lx) hex\n",
entry->text_start_address, entry->header.a_text,
entry->data_start_address, entry->header.a_data,
entry->bss_start_address, entry->header.a_bss);
fprintf(outfile,
" text %x(%lx), data %x(%lx), bss %x(%lx) hex\n",
entry->text_start_address,
(unsigned long)entry->header.a_text,
entry->data_start_address,
(unsigned long)entry->header.a_data,
entry->bss_start_address,
(unsigned long)entry->header.a_bss);
}
static void

View File

@ -1,4 +1,4 @@
/* $RCSfile: consarg.c,v $$Revision: 1.3 $$Date: 1995/05/30 05:02:57 $
/* $RCSfile: consarg.c,v $$Revision: 1.4 $$Date: 1997/08/08 20:53:58 $
*
* Copyright (c) 1991, Larry Wall
*
@ -6,6 +6,12 @@
* License or the Artistic License, as specified in the README file.
*
* $Log: consarg.c,v $
* Revision 1.4 1997/08/08 20:53:58 joerg
* Fix a buffer overflow condition (that causes a security hole in suidperl).
*
* Closes: CERT Advisory CA-97.17 - Vulnerability in suidperl
* Obtained from: (partly) the fix in CA-97.17
*
* Revision 1.3 1995/05/30 05:02:57 rgrimes
* Remove trailing whitespace.
*
@ -273,21 +279,21 @@ ARG *arg3;
}
#ifdef DEBUGGING
if (debug & 16) {
fprintf(stderr,"%lx <= make_op(%s",arg,opname[arg->arg_type]);
fprintf(stderr,"%p <= make_op(%s",arg,opname[arg->arg_type]);
if (arg1)
fprintf(stderr,",%s=%lx",
fprintf(stderr,",%s=%p",
argname[arg[1].arg_type&A_MASK],arg[1].arg_ptr.arg_arg);
if (arg2)
fprintf(stderr,",%s=%lx",
fprintf(stderr,",%s=%p",
argname[arg[2].arg_type&A_MASK],arg[2].arg_ptr.arg_arg);
if (arg3)
fprintf(stderr,",%s=%lx",
fprintf(stderr,",%s=%p",
argname[arg[3].arg_type&A_MASK],arg[3].arg_ptr.arg_arg);
if (newlen >= 4)
fprintf(stderr,",%s=%lx",
fprintf(stderr,",%s=%p",
argname[arg[4].arg_type&A_MASK],arg[4].arg_ptr.arg_arg);
if (newlen >= 5)
fprintf(stderr,",%s=%lx",
fprintf(stderr,",%s=%p",
argname[arg[5].arg_type&A_MASK],arg[5].arg_ptr.arg_arg);
fprintf(stderr,")\n");
}

View File

@ -7,9 +7,12 @@
* blame Henry for some of the lack of readability.
*/
/* $RCSfile: regexec.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
/* $RCSfile: regexec.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:16 $
*
* $Log: regexec.c,v $
* Revision 1.2 1995/05/30 05:03:16 rgrimes
* Remove trailing whitespace.
*
* Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii
* Initial import of Perl 4.046 bmaked
*
@ -791,7 +794,7 @@ char *prog;
reginput = locinput; /* put where regtry can find it */
return(1); /* Success! */
default:
printf("%x %d\n",scan,scan[1]);
printf("%p %d\n",scan,scan[1]);
FAIL("regexp memory corruption");
}

View File

@ -1,4 +1,4 @@
/* $RCSfile: str.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:21 $
/* $RCSfile: str.c,v $$Revision: 1.3 $$Date: 1997/08/08 20:53:59 $
*
* Copyright (c) 1991, Larry Wall
*
@ -6,6 +6,12 @@
* License or the Artistic License, as specified in the README file.
*
* $Log: str.c,v $
* Revision 1.3 1997/08/08 20:53:59 joerg
* Fix a buffer overflow condition (that causes a security hole in suidperl).
*
* Closes: CERT Advisory CA-97.17 - Vulnerability in suidperl
* Obtained from: (partly) the fix in CA-97.17
*
* Revision 1.2 1995/05/30 05:03:21 rgrimes
* Remove trailing whitespace.
*
@ -206,7 +212,7 @@ register STR *str;
str->str_pok = 1;
#ifdef DEBUGGING
if (debug & 32)
fprintf(stderr,"0x%lx ptr(%s)\n",str,str->str_ptr);
fprintf(stderr,"%p ptr(%s)\n",str,str->str_ptr);
#endif
return str->str_ptr;
}
@ -232,7 +238,7 @@ register STR *str;
str->str_nok = 1;
#ifdef DEBUGGING
if (debug & 32)
fprintf(stderr,"0x%lx num(%g)\n",str,str->str_u.str_nval);
fprintf(stderr,"%p num(%g)\n",str,str->str_u.str_nval);
#endif
return str->str_u.str_nval;
}