diff options
43 files changed, 166 insertions, 114 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d9797c79b3..6f2c8824f2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2008-07-30 Alan Modra <amodra@bigpond.net.au> + + * coff-ppc.c, coffgen.c, ecoff.c, ecofflink.c, elf.c, elf32-frv.c, + elf32-iq2000.c, elf32-m32c.c, elf32-mep.c, elf32-mt.c, + elf32-sh-symbian.c, elf64-hppa.c, mach-o.c, peXXigen.c, pef.c, + ppcboot.c, vms-misc.c, xsym.c: Silence gcc warnings. + 2008-07-28 Daniel Jacobowitz <dan@codesourcery.com> * elfxx-mips.c (mips_elf_calculate_relocation): Avoid generating diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c index 6f903e84c5..eed84a09ed 100644 --- a/bfd/coff-ppc.c +++ b/bfd/coff-ppc.c @@ -1,6 +1,6 @@ /* BFD back-end for PowerPC Microsoft Portable Executable files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Original version pieced together by Kim Knuttila (krk@cygnus.com) @@ -1566,8 +1566,8 @@ dump_toc (vfile) { fprintf (file, _("**** global_toc_size %ld(%lx), thunk_size %ld(%lx)\n"), - global_toc_size, global_toc_size, - thunk_size, thunk_size); + global_toc_size, (unsigned long) global_toc_size, + thunk_size, (unsigned long) thunk_size); cat = _("Out of bounds!"); } } diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 0e8b7eda5c..98b5bbea8a 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -1,6 +1,6 @@ /* Support for the generic parts of COFF, for BFD. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2007 + 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. Written by Cygnus Support. @@ -1946,7 +1946,7 @@ coff_print_symbol (bfd *abfd, /* Probably a section symbol ? */ { fprintf (file, "AUX scnlen 0x%lx nreloc %d nlnno %d", - (long) auxp->u.auxent.x_scn.x_scnlen, + (unsigned long) auxp->u.auxent.x_scn.x_scnlen, auxp->u.auxent.x_scn.x_nreloc, auxp->u.auxent.x_scn.x_nlinno); if (auxp->u.auxent.x_scn.x_checksum != 0 @@ -1972,7 +1972,8 @@ coff_print_symbol (bfd *abfd, llnos = auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_lnnoptr; fprintf (file, "AUX tagndx %ld ttlsiz 0x%lx lnnos %ld next %ld", - tagndx, auxp->u.auxent.x_sym.x_misc.x_fsize, + tagndx, + (unsigned long) auxp->u.auxent.x_sym.x_misc.x_fsize, llnos, next); break; } diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 9b2a1c933d..a31bdb96b0 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -1038,7 +1038,7 @@ ecoff_emit_aggregate (bfd *abfd, sprintf (string, "%s %s { ifd = %u, index = %lu }", which, name, ifd, - ((long) indx + ((unsigned long) indx + debug_info->symbolic_header.iextMax)); } diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c index 0b363a1162..072c97a649 100644 --- a/bfd/ecofflink.c +++ b/bfd/ecofflink.c @@ -1,6 +1,6 @@ /* Routines to link ECOFF debugging information. Copyright 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>. This file is part of BFD, the Binary File Descriptor library. @@ -718,7 +718,8 @@ bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap, lookup = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 20); if (lookup == NULL) return FALSE; - sprintf (lookup, "%s %lx %lx", name, fdr.csym, fdr.caux); + sprintf (lookup, "%s %lx %lx", name, (unsigned long) fdr.csym, + (unsigned long) fdr.caux); fh = string_hash_lookup (&ainfo->fdr_hash, lookup, TRUE, TRUE); free (lookup); @@ -1393,7 +1393,7 @@ bfd_elf_print_symbol (bfd *abfd, case bfd_print_symbol_more: fprintf (file, "elf "); bfd_fprintf_vma (abfd, file, symbol->value); - fprintf (file, " %lx", (long) symbol->flags); + fprintf (file, " %lx", (unsigned long) symbol->flags); break; case bfd_print_symbol_all: { @@ -7836,7 +7836,7 @@ elfcore_grok_win32pstatus (bfd *abfd, Elf_Internal_Note *note) /* Make a ".module/xxxxxxxx" section. */ /* module_info.base_address */ base_addr = bfd_get_32 (abfd, note->descdata + 4); - sprintf (buf, ".module/%08lx", (long) base_addr); + sprintf (buf, ".module/%08lx", (unsigned long) base_addr); len = strlen (buf) + 1; name = bfd_alloc (abfd, len); diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index aad8253bbc..01e15f9604 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -1,5 +1,5 @@ /* FRV-specific support for 32-bit ELF. - Copyright 2002, 2003, 2004, 2005, 2006, 2007 + Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -6838,7 +6838,7 @@ frv_elf_print_private_bfd_data (abfd, ptr) _bfd_elf_print_private_bfd_data (abfd, ptr); flags = elf_elfheader (abfd)->e_flags; - fprintf (file, _("private flags = 0x%lx:"), (long)flags); + fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags); switch (flags & EF_FRV_CPU_MASK) { diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c index 73ab8e9832..4dcc866e89 100644 --- a/bfd/elf32-iq2000.c +++ b/bfd/elf32-iq2000.c @@ -1,5 +1,5 @@ /* IQ2000-specific support for 32-bit ELF. - Copyright (C) 2003, 2004, 2005, 2006, 2007 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -886,7 +886,7 @@ iq2000_elf_print_private_bfd_data (bfd *abfd, void * ptr) _bfd_elf_print_private_bfd_data (abfd, ptr); flags = elf_elfheader (abfd)->e_flags; - fprintf (file, _("private flags = 0x%lx:"), (long)flags); + fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags); switch (flags & EF_IQ2000_CPU_MASK) { diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c index b18842654a..5f45784f36 100644 --- a/bfd/elf32-m32c.c +++ b/bfd/elf32-m32c.c @@ -1,5 +1,5 @@ /* M16C/M32C specific support for 32-bit ELF. - Copyright (C) 2005, 2006, 2007 + Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -847,7 +847,7 @@ m32c_elf_print_private_bfd_data (bfd *abfd, PTR ptr) _bfd_elf_print_private_bfd_data (abfd, ptr); flags = elf_elfheader (abfd)->e_flags; - fprintf (file, _("private flags = 0x%lx:"), (long)flags); + fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags); switch (flags & EF_M32C_CPU_MASK) { diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c index 783961743d..fb2bed3abe 100644 --- a/bfd/elf32-mep.c +++ b/bfd/elf32-mep.c @@ -1,5 +1,5 @@ /* MeP-specific support for 32-bit ELF. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -706,7 +706,7 @@ mep_elf_print_private_bfd_data (bfd * abfd, void * ptr) _bfd_elf_print_private_bfd_data (abfd, ptr); flags = elf_elfheader (abfd)->e_flags; - fprintf (file, _("private flags = 0x%lx"), (long)flags); + fprintf (file, _("private flags = 0x%lx"), (unsigned long) flags); partial_flags = (flags & EF_MEP_CPU_MASK) >> 24; if (partial_flags < ARRAY_SIZE (core_names)) diff --git a/bfd/elf32-mt.c b/bfd/elf32-mt.c index 3f976847d7..9b2758e65e 100644 --- a/bfd/elf32-mt.c +++ b/bfd/elf32-mt.c @@ -1,5 +1,5 @@ /* Morpho Technologies MT specific support for 32-bit ELF - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -580,7 +580,7 @@ mt_elf_print_private_bfd_data (bfd * abfd, void * ptr) _bfd_elf_print_private_bfd_data (abfd, ptr); flags = elf_elfheader (abfd)->e_flags; - fprintf (file, _("private flags = 0x%lx:"), (long)flags); + fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags); switch (flags & EF_MT_CPU_MASK) { diff --git a/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c index 361031a468..cec0d032b6 100644 --- a/bfd/elf32-sh-symbian.c +++ b/bfd/elf32-sh-symbian.c @@ -1,5 +1,5 @@ /* Renesas / SuperH specific support for Symbian 32-bit ELF files - Copyright 2004, 2005, 2006, 2007 + Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Contributed by Red Hat @@ -605,7 +605,8 @@ sh_symbian_relocate_section (bfd * output_bfd, BFD_ASSERT (ptr->new_symndx); if (SYMBIAN_DEBUG) fprintf (stderr, "convert reloc %lx from using index %ld to using index %ld\n", - (long) rel->r_info, (long) ELF32_R_SYM (rel->r_info), ptr->new_symndx); + (unsigned long) rel->r_info, + (long) ELF32_R_SYM (rel->r_info), ptr->new_symndx); rel->r_info = ELF32_R_INFO (ptr->new_symndx, r_type); break; } diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index 2359adde6d..3738d2bcf2 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -514,7 +514,7 @@ get_dyn_name (abfd, h, rel, pbuf, plen) { nlen = sprintf (buf, "%x:%lx", sec->id & 0xffffffff, - (long) ELF64_R_SYM (rel->r_info)); + (unsigned long) ELF64_R_SYM (rel->r_info)); if (rel->r_addend) { buf[nlen++] = '+'; diff --git a/bfd/libcoff.h b/bfd/libcoff.h index f21e0e6539..9d3b33fa31 100644 --- a/bfd/libcoff.h +++ b/bfd/libcoff.h @@ -4,7 +4,7 @@ /* BFD COFF object file private structure. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by Cygnus Support. diff --git a/bfd/mach-o.c b/bfd/mach-o.c index bde89b0403..d8b248e34f 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -556,7 +556,7 @@ bfd_mach_o_write_contents (bfd *abfd) default: fprintf (stderr, "unable to write unknown load command 0x%lx\n", - (long) cur->type); + (unsigned long) cur->type); return FALSE; } } @@ -1576,7 +1576,7 @@ bfd_mach_o_object_p (bfd *abfd) || header.byteorder == BFD_ENDIAN_LITTLE)) { fprintf (stderr, "unknown header byte-order value 0x%lx\n", - (long) header.byteorder); + (unsigned long) header.byteorder); goto wrong; } @@ -1623,7 +1623,7 @@ bfd_mach_o_core_p (bfd *abfd) || header.byteorder == BFD_ENDIAN_LITTLE)) { fprintf (stderr, "unknown header byte-order value 0x%lx\n", - (long) header.byteorder); + (unsigned long) header.byteorder); abort (); } diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 7be1f54530..0c56067c23 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -1310,7 +1310,7 @@ pe_print_idata (bfd * abfd, void * vfile) && first_thunk != 0 && first_thunk != hint_addr) fprintf (file, "\t%04lx", - (long) bfd_get_32 (abfd, ft_data + ft_idx + j)); + (unsigned long) bfd_get_32 (abfd, ft_data + ft_idx + j)); fprintf (file, "\n"); } #else @@ -1342,7 +1342,7 @@ pe_print_idata (bfd * abfd, void * vfile) && first_thunk != 0 && first_thunk != hint_addr) fprintf (file, "\t%04lx", - (long) bfd_get_32 (abfd, ft_data + ft_idx + j)); + (unsigned long) bfd_get_32 (abfd, ft_data + ft_idx + j)); fprintf (file, "\n"); } @@ -1961,7 +1961,7 @@ pe_print_reloc (bfd * abfd, void * vfile) fprintf (file, _("\nVirtual Address: %08lx Chunk size %ld (0x%lx) Number of fixups %ld\n"), - (unsigned long) virtual_address, size, size, number); + (unsigned long) virtual_address, size, (unsigned long) size, number); for (j = 0; j < number; ++j) { @@ -1974,7 +1974,7 @@ pe_print_reloc (bfd * abfd, void * vfile) fprintf (file, _("\treloc %4d offset %4x [%4lx] %s"), - j, off, (long) (off + virtual_address), tbl[t]); + j, off, (unsigned long) (off + virtual_address), tbl[t]); /* HIGHADJ takes an argument, - the next record *is* the low 16 bits of addend. */ @@ -2064,11 +2064,11 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) fprintf (file, "\t(%s)",name); fprintf (file, "\nMajorLinkerVersion\t%d\n", i->MajorLinkerVersion); fprintf (file, "MinorLinkerVersion\t%d\n", i->MinorLinkerVersion); - fprintf (file, "SizeOfCode\t\t%08lx\n", i->SizeOfCode); + fprintf (file, "SizeOfCode\t\t%08lx\n", (unsigned long) i->SizeOfCode); fprintf (file, "SizeOfInitializedData\t%08lx\n", - i->SizeOfInitializedData); + (unsigned long) i->SizeOfInitializedData); fprintf (file, "SizeOfUninitializedData\t%08lx\n", - i->SizeOfUninitializedData); + (unsigned long) i->SizeOfUninitializedData); fprintf (file, "AddressOfEntryPoint\t"); fprintf_vma (file, i->AddressOfEntryPoint); fprintf (file, "\nBaseOfCode\t\t"); @@ -2091,10 +2091,10 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) fprintf (file, "MinorImageVersion\t%d\n", i->MinorImageVersion); fprintf (file, "MajorSubsystemVersion\t%d\n", i->MajorSubsystemVersion); fprintf (file, "MinorSubsystemVersion\t%d\n", i->MinorSubsystemVersion); - fprintf (file, "Win32Version\t\t%08lx\n", i->Reserved1); - fprintf (file, "SizeOfImage\t\t%08lx\n", i->SizeOfImage); - fprintf (file, "SizeOfHeaders\t\t%08lx\n", i->SizeOfHeaders); - fprintf (file, "CheckSum\t\t%08lx\n", i->CheckSum); + fprintf (file, "Win32Version\t\t%08lx\n", (unsigned long) i->Reserved1); + fprintf (file, "SizeOfImage\t\t%08lx\n", (unsigned long) i->SizeOfImage); + fprintf (file, "SizeOfHeaders\t\t%08lx\n", (unsigned long) i->SizeOfHeaders); + fprintf (file, "CheckSum\t\t%08lx\n", (unsigned long) i->CheckSum); switch (i->Subsystem) { @@ -2149,15 +2149,16 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) fprintf_vma (file, i->SizeOfHeapReserve); fprintf (file, "\nSizeOfHeapCommit\t"); fprintf_vma (file, i->SizeOfHeapCommit); - fprintf (file, "\nLoaderFlags\t\t%08lx\n", i->LoaderFlags); - fprintf (file, "NumberOfRvaAndSizes\t%08lx\n", i->NumberOfRvaAndSizes); + fprintf (file, "\nLoaderFlags\t\t%08lx\n", (unsigned long) i->LoaderFlags); + fprintf (file, "NumberOfRvaAndSizes\t%08lx\n", + (unsigned long) i->NumberOfRvaAndSizes); fprintf (file, "\nThe Data Directory\n"); for (j = 0; j < IMAGE_NUMBEROF_DIRECTORY_ENTRIES; j++) { fprintf (file, "Entry %1x ", j); fprintf_vma (file, i->DataDirectory[j].VirtualAddress); - fprintf (file, " %08lx ", i->DataDirectory[j].Size); + fprintf (file, " %08lx ", (unsigned long) i->DataDirectory[j].Size); fprintf (file, "%s\n", dir_names[j]); } @@ -1,5 +1,5 @@ /* PEF support for BFD. - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -186,7 +186,7 @@ bfd_pef_parse_traceback_table (bfd *abfd, offset += 4; if (file != NULL) - fprintf (file, " [length = 0x%lx]", (long) offset); + fprintf (file, " [length = 0x%lx]", (unsigned long) offset); return offset; } diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c index b4b6e7a2a8..d51280c8d8 100644 --- a/bfd/ppcboot.c +++ b/bfd/ppcboot.c @@ -1,6 +1,6 @@ /* BFD back-end for PPCbug boot records. Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Michael Meissner, Cygnus Support, <meissner@cygnus.com> This file is part of BFD, the Binary File Descriptor library. @@ -412,8 +412,10 @@ ppcboot_bfd_print_private_bfd_data (abfd, farg) int i; fprintf (f, _("\nppcboot header:\n")); - fprintf (f, _("Entry offset = 0x%.8lx (%ld)\n"), entry_offset, entry_offset); - fprintf (f, _("Length = 0x%.8lx (%ld)\n"), length, length); + fprintf (f, _("Entry offset = 0x%.8lx (%ld)\n"), + (unsigned long) entry_offset, entry_offset); + fprintf (f, _("Length = 0x%.8lx (%ld)\n"), + (unsigned long) length, length); if (tdata->header.flags) fprintf (f, _("Flag field = 0x%.2x\n"), tdata->header.flags); @@ -453,8 +455,10 @@ ppcboot_bfd_print_private_bfd_data (abfd, farg) tdata->header.partition[i].partition_end.sector, tdata->header.partition[i].partition_end.cylinder); - fprintf (f, _("Partition[%d] sector = 0x%.8lx (%ld)\n"), i, sector_begin, sector_begin); - fprintf (f, _("Partition[%d] length = 0x%.8lx (%ld)\n"), i, sector_length, sector_length); + fprintf (f, _("Partition[%d] sector = 0x%.8lx (%ld)\n"), + i, (unsigned long) sector_begin, sector_begin); + fprintf (f, _("Partition[%d] length = 0x%.8lx (%ld)\n"), + i, (unsigned long) sector_length, sector_length); } fprintf (f, "\n"); diff --git a/bfd/vms-misc.c b/bfd/vms-misc.c index 87f7ce8088..9d0ffdb273 100644 --- a/bfd/vms-misc.c +++ b/bfd/vms-misc.c @@ -875,7 +875,7 @@ hash_string (const char *ptr) char * _bfd_vms_length_hash_symbol (bfd * abfd, const char *in, int maxlen) { - long int result; + unsigned long result; int in_len; char *new_name; const char *old_name; diff --git a/bfd/xsym.c b/bfd/xsym.c index 49a1d60755..ac5d80b611 100644 --- a/bfd/xsym.c +++ b/bfd/xsym.c @@ -1,5 +1,5 @@ /* xSYM symbol-file support for BFD. - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -1640,7 +1640,7 @@ bfd_sym_print_type_information (bfd *abfd, bfd_sym_symbol_name (abfd, tinfo.nte_index)[0], &bfd_sym_symbol_name (abfd, tinfo.nte_index)[1]); } - fprintf (f, " (TTE %lu)", value); + fprintf (f, " (TTE %lu)", (unsigned long) value); break; } @@ -1701,13 +1701,13 @@ bfd_sym_print_type_information (bfd *abfd, fprintf (f, "union (0x%x) of ", type); bfd_sym_fetch_long (buf, len, offset, &offset, &nrec); - fprintf (f, "%lu elements: ", nrec); + fprintf (f, "%lu elements: ", (unsigned long) nrec); for (i = 0; i < nrec; i++) { bfd_sym_fetch_long (buf, len, offset, &offset, &eloff); fprintf (f, "\n "); - fprintf (f, "offset %lu: ", eloff); + fprintf (f, "offset %lu: ", (unsigned long) eloff); bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset); } break; @@ -1735,7 +1735,7 @@ bfd_sym_print_type_information (bfd *abfd, bfd_sym_symbol_name (abfd, value)[0], &bfd_sym_symbol_name (abfd, value)[1]); - fprintf (f, " (NTE %lu) with type ", value); + fprintf (f, " (NTE %lu) with type ", (unsigned long) value); bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset); break; } diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c9020498fa..d4e71ae3e5 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2008-07-30 Alan Modra <amodra@bigpond.net.au> + + * dlltool.c, dwarf.c, objdump.c, readelf.c, resrc.c, resres.c, + windmc.c: Silence gcc warnings. + 2008-07-28 Alan Modra <amodra@bigpond.net.au> * readelf.c (print_vma): Typo fix. diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 61361b74a3..505402bf66 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -1604,7 +1604,7 @@ flush_page (FILE *f, long *need, int page_addr, int on_page) for (i = 0; i < on_page; i++) { - long needed = need[i]; + unsigned long needed = need[i]; if (needed) needed = ((needed - page_addr) | 0x3000) & 0xffff; @@ -1826,8 +1826,8 @@ gen_exp_file (void) { fprintf (f, "\t.section .edata\n\n"); fprintf (f, "\t%s 0 %s Allways 0\n", ASM_LONG, ASM_C); - fprintf (f, "\t%s 0x%lx %s Time and date\n", ASM_LONG, (long) time(0), - ASM_C); + fprintf (f, "\t%s 0x%lx %s Time and date\n", ASM_LONG, + (unsigned long) time(0), ASM_C); fprintf (f, "\t%s 0 %s Major and Minor version\n", ASM_LONG, ASM_C); fprintf (f, "\t%sname%s %s Ptr to name of dll\n", ASM_RVA_BEFORE, ASM_RVA_AFTER, ASM_C); fprintf (f, "\t%s %d %s Starting ordinal of exports\n", ASM_LONG, d_low_ord, ASM_C); diff --git a/binutils/dwarf.c b/binutils/dwarf.c index d23fec2898..26ab941ece 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -1524,7 +1524,7 @@ read_and_display_attr_value (unsigned long attribute, if (uvalue >= section->size) warn (_("Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"), - uvalue, (long int)(orig_data - section->start)); + uvalue, (unsigned long) (orig_data - section->start)); else { unsigned long abbrev_number; @@ -3109,10 +3109,12 @@ display_debug_loc (struct dwarf_section *section, void *file) { if (start < next) warn (_("There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"), - (long)(start - section_begin), (long)(next - section_begin)); + (unsigned long) (start - section_begin), + (unsigned long) (next - section_begin)); else if (start > next) warn (_("There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"), - (long)(start - section_begin), (long)(next - section_begin)); + (unsigned long) (start - section_begin), + (unsigned long) (next - section_begin)); } start = next; @@ -3502,12 +3504,12 @@ display_debug_ranges (struct dwarf_section *section, { if (start < next) warn (_("There is a hole [0x%lx - 0x%lx] in %s section.\n"), - (long)(start - section_begin), - (long)(next - section_begin), section->name); + (unsigned long) (start - section_begin), + (unsigned long) (next - section_begin), section->name); else if (start > next) warn (_("There is an overlap [0x%lx - 0x%lx] in %s section.\n"), - (long)(start - section_begin), - (long)(next - section_begin), section->name); + (unsigned long) (start - section_begin), + (unsigned long) (next - section_begin), section->name); } start = next; diff --git a/binutils/objdump.c b/binutils/objdump.c index 74a4198849..d4c32c03a2 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -1428,7 +1428,8 @@ disassemble_bytes (struct disassemble_info * info, if (display_file_offsets && ((addr_offset + (octets / opb)) < stop_offset)) printf ("\t... (skipping %d zeroes, resuming at file offset: 0x%lx)\n", octets / opb, - (long int)(section->filepos + (addr_offset + (octets / opb)))); + (unsigned long) (section->filepos + + (addr_offset + (octets / opb)))); else printf ("\t...\n"); } @@ -2563,7 +2564,8 @@ dump_section (bfd *abfd, asection *section, void *dummy ATTRIBUTE_UNUSED) printf (_("Contents of section %s:"), section->name); if (display_file_offsets) - printf (_(" (Starting at file offset: 0x%lx)"), (long int)(section->filepos + start_offset)); + printf (_(" (Starting at file offset: 0x%lx)"), + (unsigned long) (section->filepos + start_offset)); printf ("\n"); data = xmalloc (datasize); diff --git a/binutils/readelf.c b/binutils/readelf.c index 5f3946e413..80c5b03c7f 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -310,7 +310,7 @@ get_data (void *var, FILE *file, long offset, size_t size, size_t nmemb, if (fseek (file, archive_file_offset + offset, SEEK_SET)) { error (_("Unable to seek to 0x%lx for %s\n"), - archive_file_offset + offset, reason); + (unsigned long) archive_file_offset + offset, reason); return NULL; } @@ -3669,7 +3669,7 @@ offset_from_vma (FILE *file, bfd_vma vma, bfd_size_type size) } warn (_("Virtual address 0x%lx not located in any PT_LOAD segment.\n"), - (long) vma); + (unsigned long) vma); return (long) vma; } @@ -5686,7 +5686,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn *entry) break; default: - printf ("%#lx\n", (long) entry->d_un.d_ptr); + printf ("%#lx\n", (unsigned long) entry->d_un.d_ptr); } } @@ -9735,7 +9735,7 @@ process_gnu_liblist (FILE *file) printf (_("\nLibrary list section '%s' contains %lu entries:\n"), SECTION_NAME (section), - (long) (section->sh_size / sizeof (Elf32_External_Lib))); + (unsigned long) (section->sh_size / sizeof (Elf32_External_Lib))); puts (" Library Time Stamp Checksum Version Flags"); @@ -9995,7 +9995,7 @@ process_corefile_note_segment (FILE *file, bfd_vma offset, bfd_vma length) if (((char *) next) > (((char *) pnotes) + length)) { warn (_("corrupt note found at offset %lx into core notes\n"), - (long)((char *)external - (char *)pnotes)); + (unsigned long) ((char *) external - (char *) pnotes)); warn (_(" type: %lx, namesize: %08lx, descsize: %08lx\n"), inote.type, inote.namesz, inote.descsz); break; diff --git a/binutils/resrc.c b/binutils/resrc.c index 8a5900bdc4..fcd15c70f8 100644 --- a/binutils/resrc.c +++ b/binutils/resrc.c @@ -1,5 +1,5 @@ /* resrc.c -- read and write Windows rc files. - Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007 + Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. Rewritten by Kai Tietz, Onevision. @@ -685,7 +685,8 @@ get_data (FILE *e, bfd_byte *p, rc_uint_type c, const char *msg) if (got == c) return; - fatal (_("%s: read of %lu returned %lu"), msg, (long) c, (long) got); + fatal (_("%s: read of %lu returned %lu"), + msg, (unsigned long) c, (unsigned long) got); } /* Define an accelerator resource. */ @@ -3061,10 +3062,10 @@ write_rc_datablock (FILE *e, rc_uint_type length, const bfd_byte *data, int has_ { if (k == 0) plen = fprintf (e, "0x%lxL", - (long) windres_get_32 (&wrtarget, data + i, length - i)); + (unsigned long) windres_get_32 (&wrtarget, data + i, length - i)); else plen = fprintf (e, " 0x%lxL", - (long) windres_get_32 (&wrtarget, data + i, length - i)) - 1; + (unsigned long) windres_get_32 (&wrtarget, data + i, length - i)) - 1; if (has_next || (i + 4) < length) { if (plen>0 && plen < 11) @@ -3210,7 +3211,7 @@ write_rc_stringtable (FILE *e, const rc_res_id *name, { if (stringtable->strings[i].length != 0) { - fprintf (e, " %lu, ", (long) offset + i); + fprintf (e, " %lu, ", (unsigned long) offset + i); unicode_print_quoted (e, stringtable->strings[i].string, stringtable->strings[i].length); fprintf (e, "\n"); diff --git a/binutils/resres.c b/binutils/resres.c index 0ae5694a87..2ad40b481a 100644 --- a/binutils/resres.c +++ b/binutils/resres.c @@ -155,8 +155,8 @@ write_res_file (const char *fn,const rc_res_directory *resdir) (const rc_res_id *) NULL, &language, 1); if (sec_length != sec_length_wrote) - fatal ("res write failed with different sizes (%lu/%lu).", (long) sec_length, - (long) sec_length_wrote); + fatal ("res write failed with different sizes (%lu/%lu).", + (unsigned long) sec_length, (unsigned long) sec_length_wrote); bfd_close (abfd); return; diff --git a/binutils/windmc.c b/binutils/windmc.c index 70c9160aba..283c265750 100644 --- a/binutils/windmc.c +++ b/binutils/windmc.c @@ -381,7 +381,8 @@ convert_unicode_to_ACP (const unichar *usz) return NULL; codepage_from_unicode (&l, usz, &s, mcset_codepage_out); if (! s) - fatal ("unicode string not mappable to ASCII codepage 0x%lx.\n", (long) mcset_codepage_out); + fatal ("unicode string not mappable to ASCII codepage 0x%lx.\n", + (unsigned long) mcset_codepage_out); return s; } @@ -803,8 +804,8 @@ write_rc (FILE *fp) int i, l; fprintf (fp, - "/* Do not edit this file manually.\n" - " This file is autogenerated by windmc. */\n\n"); + "/* Do not edit this file manually.\n" + " This file is autogenerated by windmc. */\n\n"); if (! mc_nodes_lang_count) return; n = NULL; @@ -816,10 +817,11 @@ write_rc (FILE *fp) ++i; n = mc_nodes_lang[l]; fprintf (fp, "\n// Country: %s\n// Language: %s\n#pragma code_page(%u)\n", - n->lang->lang_info.country, n->lang->lang_info.name, - (unsigned) n->lang->lang_info.wincp); - fprintf (fp, "LANGUAGE 0x%lx, 0x%lx\n", (long) (n->lang->nval & 0x3ff), - (long) ((n->lang->nval & 0xffff) >> 10)); + n->lang->lang_info.country, n->lang->lang_info.name, + (unsigned) n->lang->lang_info.wincp); + fprintf (fp, "LANGUAGE 0x%lx, 0x%lx\n", + (unsigned long) (n->lang->nval & 0x3ff), + (unsigned long) ((n->lang->nval & 0xffff) >> 10)); fprintf (fp, "1 MESSAGETABLE \""); if (mcset_prefix_bin) fprintf (fp, "%s_", mcset_mc_basename); diff --git a/gas/ChangeLog b/gas/ChangeLog index 6196e16ddf..e8a6ab5b50 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2008-07-30 Alan Modra <amodra@bigpond.net.au> + + * messages.c, symbols.c, write.c: Silence gcc warnings. + 2008-07-28 Ineiev <ineiev@yahoo.co.uk> * config/tc-i386.c (operand_type_check): Warning fix. diff --git a/gas/messages.c b/gas/messages.c index bbe181bbc9..69fcf78743 100644 --- a/gas/messages.c +++ b/gas/messages.c @@ -1,6 +1,6 @@ /* messages.c - error reporter - Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, - 2003, 2004, 2005, 2006, 2007 + 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -500,9 +500,9 @@ as_internal_value_out_of_range (char * prefix, if (sizeof (val) > sizeof (bfd_vma)) abort (); - sprintf_vma (val_buf, val); - sprintf_vma (min_buf, min); - sprintf_vma (max_buf, max); + sprintf_vma (val_buf, (bfd_vma) val); + sprintf_vma (min_buf, (bfd_vma) min); + sprintf_vma (max_buf, (bfd_vma) max); /* xgettext:c-format. */ err = _("%s out of range (0x%s is not between 0x%s and 0x%s)"); diff --git a/gas/symbols.c b/gas/symbols.c index 252cfcef4e..c7262b8445 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -1,6 +1,6 @@ /* symbols.c -symbol table- Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -2791,7 +2791,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym) if (s != undefined_section && s != expr_section) - fprintf (file, " %lx", (long) S_GET_VALUE (sym)); + fprintf (file, " %lx", (unsigned long) S_GET_VALUE (sym)); } else if (indent_level < max_indent_level && S_GET_SEGMENT (sym) != undefined_section) @@ -2800,7 +2800,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym) fprintf (file, "\n%*s<", indent_level * 4, ""); if (LOCAL_SYMBOL_CHECK (sym)) fprintf (file, "constant %lx", - (long) ((struct local_symbol *) sym)->lsy_value); + (unsigned long) ((struct local_symbol *) sym)->lsy_value); else print_expr_1 (file, &sym->sy_value); fprintf (file, ">"); @@ -2844,7 +2844,7 @@ print_expr_1 (FILE *file, expressionS *exp) fprintf (file, "absent"); break; case O_constant: - fprintf (file, "constant %lx", (long) exp->X_add_number); + fprintf (file, "constant %lx", (unsigned long) exp->X_add_number); break; case O_symbol: indent_level++; @@ -2854,7 +2854,7 @@ print_expr_1 (FILE *file, expressionS *exp) maybe_print_addnum: if (exp->X_add_number) fprintf (file, "\n%*s%lx", indent_level * 4, "", - (long) exp->X_add_number); + (unsigned long) exp->X_add_number); indent_level--; break; case O_register: diff --git a/gas/write.c b/gas/write.c index 2ba44b9173..660df811b6 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1,6 +1,6 @@ /* write.c - emit .o file Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -2516,7 +2516,8 @@ print_fixup (fixS *fixp) fprintf_vma (stderr, (bfd_vma) ((bfd_hostptr_t) fixp->fx_frag)); fprintf (stderr, " where=%ld offset=%lx addnumber=%lx", (long) fixp->fx_where, - (long) fixp->fx_offset, (long) fixp->fx_addnumber); + (unsigned long) fixp->fx_offset, + (unsigned long) fixp->fx_addnumber); fprintf (stderr, "\n %s (%d)", bfd_get_reloc_code_name (fixp->fx_r_type), fixp->fx_r_type); if (fixp->fx_addsy) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index cd019772b6..c79895850a 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,7 @@ +2008-07-30 Alan Modra <amodra@bigpond.net.au> + + * corefile.c, symtab.c: Silence gcc warnings. + 2008-06-19 Andreas Schwab <schwab@suse.de> * basic_blocks.c: Always include "gprof.h" first. diff --git a/gprof/corefile.c b/gprof/corefile.c index 4aec15c980..243a600f7e 100644 --- a/gprof/corefile.c +++ b/gprof/corefile.c @@ -1,6 +1,6 @@ /* corefile.c - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -427,7 +427,8 @@ get_src_info (bfd_vma addr, const char **filename, const char **name, int *line_ else { DBG (AOUTDEBUG, printf ("[get_src_info] no info for 0x%lx (%s:%d,%s)\n", - (long) addr, fname ? fname : "<unknown>", l, + (unsigned long) addr, + fname ? fname : "<unknown>", l, func_name ? func_name : "<unknown>")); return FALSE; } diff --git a/gprof/symtab.c b/gprof/symtab.c index bdd1a9e507..3436f1b4c8 100644 --- a/gprof/symtab.c +++ b/gprof/symtab.c @@ -1,6 +1,7 @@ /* symtab.c - Copyright 1999, 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc. + Copyright 1999, 2000, 2001, 2002, 2004, 2007, 2008 + Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -164,8 +165,9 @@ symtab_finalize (Sym_Table *tab) for (j = 0; j < tab->len; ++j) { printf ("[symtab_finalize] 0x%lx-0x%lx\t%s\n", - (long) tab->base[j].addr, (long) tab->base[j].end_addr, - tab->base[j].name); + (unsigned long) tab->base[j].addr, + (unsigned long) tab->base[j].end_addr, + tab->base[j].name); } ); } @@ -176,7 +178,7 @@ symtab_finalize (Sym_Table *tab) Sym * dbg_sym_lookup (Sym_Table *sym_tab, bfd_vma address) { - long low, mid, high; + unsigned long low, mid, high; Sym *sym; fprintf (stderr, "[dbg_sym_lookup] address 0x%lx\n", diff --git a/ld/ChangeLog b/ld/ChangeLog index 36d8560a1c..9f40d043f3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2008-07-30 Alan Modra <amodra@bigpond.net.au> + + * emultempl/pe.em, emultempl/pep.em: Silence gcc warnings. + 2008-07-18 Joseph Myers <joseph@codesourcery.com> * ld.texinfo (--no-wchar-size-warning): Document new ARM option. diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 1ef225ae96..08cfcfc24a 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -885,7 +885,7 @@ make_import_fixup (arelent *rel, asection *s) if (pe_dll_extra_pe_debug) printf ("arelent: %s@%#lx: add=%li\n", sym->name, - (long) rel->address, (long) rel->addend); + (unsigned long) rel->address, (long) rel->addend); if (! bfd_get_section_contents (s->owner, s, addend, rel->address, sizeof (addend))) einfo (_("%C: Cannot get section contents - auto-import exception\n"), diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 93190a1f7b..2fae386650 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -844,7 +844,7 @@ make_import_fixup (arelent *rel, asection *s) if (pep_dll_extra_pe_debug) printf ("arelent: %s@%#lx: add=%li\n", sym->name, - (long) rel->address, (long) rel->addend); + (unsigned long) rel->address, (long) rel->addend); if (! bfd_get_section_contents (s->owner, s, addend, rel->address, sizeof (addend))) einfo (_("%C: Cannot get section contents - auto-import exception\n"), diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 4110c10dfa..cadea97b43 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2008-07-30 Alan Modra <amodra@bigpond.net.au> + + * bfin-dis.c, cris-dis.c, i386-dis.c, or32-opc.c: Silence gcc warnings. + 2008-07-10 Richard Sandiford <rdsandiford@googlemail.com> * mips-dis.c (_print_insn_mips): Use ELF_ST_IS_MIPS16. diff --git a/opcodes/bfin-dis.c b/opcodes/bfin-dis.c index d74fa58e93..e68b7d5e8f 100644 --- a/opcodes/bfin-dis.c +++ b/opcodes/bfin-dis.c @@ -1,5 +1,5 @@ /* Disassemble ADI Blackfin Instructions. - Copyright 2005, 2007 Free Software Foundation, Inc. + Copyright 2005, 2007, 2008 Free Software Foundation, Inc. This file is part of libopcodes. @@ -148,7 +148,7 @@ fmtconst (const_forms_t cf, TIword x, bfd_vma pc, disassemble_info * outf) } else { - sprintf (buf, "%lx", x); + sprintf (buf, "%lx", (unsigned long) x); return buf; } } @@ -186,7 +186,7 @@ fmtconst (const_forms_t cf, TIword x, bfd_vma pc, disassemble_info * outf) if (constant_formats[cf].issigned && x < 0) sprintf (buf, "-0x%x", abs (x)); else - sprintf (buf, "0x%lx", x); + sprintf (buf, "0x%lx", (unsigned long) x); } return buf; diff --git a/opcodes/cris-dis.c b/opcodes/cris-dis.c index 64e55e239a..01e69cab06 100644 --- a/opcodes/cris-dis.c +++ b/opcodes/cris-dis.c @@ -1,5 +1,5 @@ /* Disassembler code for CRIS. - Copyright 2000, 2001, 2002, 2004, 2005, 2006, 2007 + Copyright 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Contributed by Axis Communications AB, Lund, Sweden. Written by Hans-Peter Nilsson. @@ -581,7 +581,10 @@ static char * format_dec (long number, char *outbuffer, int signedp) { last_immediate = number; - sprintf (outbuffer, signedp ? "%ld" : "%lu", number); + if (signedp) + sprintf (outbuffer, "%ld", number); + else + sprintf (outbuffer, "%lu", (unsigned long) number); return outbuffer + strlen (outbuffer); } diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 4f3c9e0ece..c0688cf8f1 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -1,6 +1,7 @@ /* Print i386 instructions for GDB, the GNU debugger. Copyright 1988, 1989, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. This file is part of the GNU opcodes library. @@ -11234,7 +11235,7 @@ print_displacement (char *buf, bfd_vma disp) buf[j++] = '0'; buf[j++] = 'x'; - sprintf_vma (tmp, val); + sprintf_vma (tmp, (bfd_vma) val); for (i = 0; tmp[i] == '0'; i++) continue; if (tmp[i] == '\0') diff --git a/opcodes/or32-opc.c b/opcodes/or32-opc.c index e52dbd671c..aa94c1365c 100644 --- a/opcodes/or32-opc.c +++ b/opcodes/or32-opc.c @@ -1,5 +1,5 @@ /* Table of opcodes for the OpenRISC 1000 ISA. - Copyright 2002, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright 2002, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. Contributed by Damjan Lampret (lampret@opencores.org). This file is part of the GNU opcodes library. @@ -586,7 +586,8 @@ cover_insn (unsigned long * cur, int pass, unsigned int mask) c = cover_insn (cur, curpass, mask & (~(cur_mask << best_first))); if (c) { - debug (8, "%li> #%X -> %lu\n", (long)(next - automata), i, (long)(cur - automata)); + debug (8, "%li> #%X -> %lu\n", (long)(next - automata), i, + (unsigned long)(cur - automata)); *next = cur - automata; cur = c; } |