riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

* rdcoff.c: Fix formatting. 

* rddbg.c: Likewise.
	* readelf.c: Likewise.
	* rename.c: Likewise.
	* resbin.c: Likewise.
	* resrc.c: Likewise.
	* resres.c: Likewise.
binutils-2_13-branch
Kazu Hirata 24 years ago
parent
9ee0b326c9
commit
53c7db4bbb
8 changed files with 224 additions and 214 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      binutils/ChangeLog
  2. 12
      binutils/rdcoff.c
  3. 6
      binutils/rddbg.c
  4. 320
      binutils/readelf.c
  5. 6
      binutils/rename.c
  6. 28
      binutils/resbin.c
  7. 52
      binutils/resrc.c
  8. 4
      binutils/resres.c

10
binutils/ChangeLog
View File

@ -1,3 +1,13 @@
2002-05-23 Kazu Hirata <kazu@cs.umass.edu>
* rdcoff.c: Fix formatting.
* rddbg.c: Likewise.
* readelf.c: Likewise.
* rename.c: Likewise.
* resbin.c: Likewise.
* resrc.c: Likewise.
* resres.c: Likewise.
2002-05-21 Kazu Hirata <kazu@cs.umass.edu>
* filemode.c: Fix formatting.

12
binutils/rdcoff.c
View File

@ -655,7 +655,7 @@ parse_coff_symbol (abfd, types, sym, coff_symno, psyment, dhandle, type,
break;
}
return true;
return true;
}
/* Determine if a symbol has external visibility. */
@ -666,13 +666,13 @@ external_coff_symbol_p (sym_class)
{
switch (sym_class)
{
case C_EXT:
case C_WEAKEXT:
return true;
case C_EXT:
case C_WEAKEXT:
return true;
default:
break;
}
return false;
return false;
}
/* This is the main routine. It looks through all the symbols and
@ -786,7 +786,7 @@ parse_coff (abfd, syms, symcount, dhandle)
if (syment.n_type == T_NULL)
break;
/* Fall through. */
case C_WEAKEXT:
case C_WEAKEXT:
case C_EXT:
if (ISFCN (syment.n_type))
{

6
binutils/rddbg.c
View File

@ -185,7 +185,7 @@ read_section_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
char *f, *s;
f = NULL;
if (stroff + strx > strsize)
{
fprintf (stderr, "%s: %s: stab entry %d is corrupt, strx = 0x%x, type = %d\n",
@ -193,9 +193,9 @@ read_section_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
(stab - stabs) / 12, strx, type);
continue;
}
s = (char *) strings + stroff + strx;
while (s[strlen (s) - 1] == '\\'
&& stab + 12 < stabs + stabsize)
{

320
binutils/readelf.c
View File

@ -534,7 +534,7 @@ print_symbol (width, symbol)
printf (symbol);
else if (width < 0)
printf ("%-*.*s", width, width, symbol);
else
else
printf ("%-.*s", width, symbol);
}
@ -911,7 +911,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
}
else
{
if (elf_header.e_machine == EM_MIPS)
if (elf_header.e_machine == EM_MIPS)
{
type = ELF64_MIPS_R_TYPE (info);
type2 = ELF64_MIPS_R_TYPE2 (info);
@ -1041,7 +1041,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
case EM_MIPS:
case EM_MIPS_RS3_LE:
rtype = elf_mips_reloc_type (type);
if (!is_32bit_elf)
if (!is_32bit_elf)
{
rtype2 = elf_mips_reloc_type (type2);
rtype3 = elf_mips_reloc_type (type3);
@ -1095,10 +1095,10 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
rtype = elf_x86_64_reloc_type (type);
break;
case EM_S390_OLD:
case EM_S390:
rtype = elf_s390_reloc_type (type);
break;
case EM_S390_OLD:
case EM_S390:
rtype = elf_s390_reloc_type (type);
break;
case EM_XSTORMY16:
rtype = elf_xstormy16_reloc_type (type);
@ -1151,7 +1151,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
putchar ('\n');
if (! is_32bit_elf && elf_header.e_machine == EM_MIPS)
if (! is_32bit_elf && elf_header.e_machine == EM_MIPS)
{
printf (" Type2: ");
@ -1175,7 +1175,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
else
printf ("%-17.17s", rtype3);
putchar ('\n');
putchar ('\n');
}
}
@ -1705,12 +1705,12 @@ get_machine_flags (e_flags, e_machine)
decode_ARM_machine_flags (e_flags, buf);
break;
case EM_68K:
if (e_flags & EF_CPU32)
strcat (buf, ", cpu32");
case EM_68K:
if (e_flags & EF_CPU32)
strcat (buf, ", cpu32");
if (e_flags & EF_M68000)
strcat (buf, ", m68000");
break;
break;
case EM_PPC:
if (e_flags & EF_PPC_EMB)
@ -2392,7 +2392,7 @@ parse_args (argc, argv)
else
{
unsigned int index = 0;
do_debugging = 0;
while (optarg[index])
@ -2443,7 +2443,7 @@ parse_args (argc, argv)
case 'O':
do_debug_loc = 1;
break;
default:
warn (_("Unrecognized debug option '%s'\n"), optarg);
break;
@ -3425,13 +3425,13 @@ process_section_headers (file)
{
putchar (' ');
print_vma (section->sh_addr, LONG_HEX);
if ((long) section->sh_offset == section->sh_offset)
printf (" %8.8lx", (unsigned long) section->sh_offset);
else
{
printf (" ");
print_vma (section->sh_offset, LONG_HEX);
}
if ((long) section->sh_offset == section->sh_offset)
printf (" %8.8lx", (unsigned long) section->sh_offset);
else
{
printf (" ");
print_vma (section->sh_offset, LONG_HEX);
}
printf ("\n ");
print_vma (section->sh_size, LONG_HEX);
printf (" ");
@ -6169,12 +6169,12 @@ display_debug_lines (section, start, file)
state_machine_regs.line += adv;
printf (_(" and Line by %d to %d\n"),
adv, state_machine_regs.line);
}
else switch (op_code)
}
else switch (op_code)
{
case DW_LNS_extended_op:
data += process_extended_line_op (data, info.li_default_is_stmt,
debug_line_pointer_size);
debug_line_pointer_size);
break;
case DW_LNS_copy:
@ -6243,17 +6243,17 @@ display_debug_lines (section, start, file)
case DW_LNS_set_prologue_end:
printf (_(" Set prologue_end to true\n"));
break;
case DW_LNS_set_epilogue_begin:
printf (_(" Set epilogue_begin to true\n"));
break;
case DW_LNS_set_isa:
adv = read_leb128 (data, & bytes_read, 0);
data += bytes_read;
printf (_(" Set ISA to %d\n"), adv);
break;
default:
printf (_(" Unknown opcode %d with operands: "), op_code);
{
@ -7252,7 +7252,7 @@ display_debug_loc (section, start, file)
unsigned long bytes;
unsigned char *section_begin = start;
bfd_vma addr;
addr = section->sh_addr;
bytes = section->sh_size;
section_end = start + bytes;
@ -7274,7 +7274,7 @@ display_debug_loc (section, start, file)
while (1)
{
/* Normally, the lists in the debug_loc section are related to a
/* Normally, the lists in the debug_loc section are related to a
given compilation unit, and thus, we would use the
pointer size of that compilation unit. However, since we are
displaying it seperately here, we either have to store
@ -7285,20 +7285,20 @@ display_debug_loc (section, start, file)
start += debug_line_pointer_size;
end = byte_get (start, debug_line_pointer_size);
start += debug_line_pointer_size;
if (begin == 0 && end == 0)
break;
begin += addr;
end += addr;
length = byte_get (start, 2);
start += 2;
printf (" %8.8lx %8.8lx %8.8lx (", offset, begin, end);
decode_location_expression (start, debug_line_pointer_size, length);
printf (")\n");
start += length;
}
printf ("\n");
@ -7485,7 +7485,7 @@ read_and_display_attr_value (attribute, form, data, cu_offset, pointer_size)
data += bytes_read;
printf (" %s", get_FORM_name (form));
return read_and_display_attr_value (attribute, form, data, cu_offset,
pointer_size);
pointer_size);
}
switch (form)
@ -7734,7 +7734,7 @@ read_and_display_attr (attribute, form, data, cu_offset, pointer_size)
{
printf (" %-18s:", get_AT_name (attribute));
data = read_and_display_attr_value (attribute, form, data, cu_offset,
pointer_size);
pointer_size);
printf ("\n");
return data;
}
@ -8373,102 +8373,102 @@ display_debug_frames (section, start, file)
about to interpret instructions for the chunk. */
if (do_debug_frames_interp)
{
/* Start by making a pass over the chunk, allocating storage
and taking note of what registers are used. */
unsigned char * tmp = start;
{
/* Start by making a pass over the chunk, allocating storage
and taking note of what registers are used. */
unsigned char * tmp = start;
while (start < block_end)
{
unsigned op, opa;
unsigned long reg;
while (start < block_end)
{
unsigned op, opa;
unsigned long reg;
op = * start ++;
opa = op & 0x3f;
if (op & 0xc0)
op &= 0xc0;
op = * start ++;
opa = op & 0x3f;
if (op & 0xc0)
op &= 0xc0;
/* Warning: if you add any more cases to this switch, be
sure to add them to the corresponding switch below. */
switch (op)
{
case DW_CFA_advance_loc:
break;
case DW_CFA_offset:
LEB ();
frame_need_space (fc, opa);
fc->col_type[opa] = DW_CFA_undefined;
break;
case DW_CFA_restore:
frame_need_space (fc, opa);
fc->col_type[opa] = DW_CFA_undefined;
break;
case DW_CFA_set_loc:
start += encoded_ptr_size;
break;
case DW_CFA_advance_loc1:
start += 1;
break;
case DW_CFA_advance_loc2:
start += 2;
break;
case DW_CFA_advance_loc4:
start += 4;
break;
case DW_CFA_offset_extended:
reg = LEB (); LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_restore_extended:
reg = LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_undefined:
reg = LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_same_value:
reg = LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_register:
reg = LEB (); LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_def_cfa:
LEB (); LEB ();
break;
case DW_CFA_def_cfa_register:
LEB ();
break;
case DW_CFA_def_cfa_offset:
LEB ();
break;
/* Warning: if you add any more cases to this switch, be
sure to add them to the corresponding switch below. */
switch (op)
{
case DW_CFA_advance_loc:
break;
case DW_CFA_offset:
LEB ();
frame_need_space (fc, opa);
fc->col_type[opa] = DW_CFA_undefined;
break;
case DW_CFA_restore:
frame_need_space (fc, opa);
fc->col_type[opa] = DW_CFA_undefined;
break;
case DW_CFA_set_loc:
start += encoded_ptr_size;
break;
case DW_CFA_advance_loc1:
start += 1;
break;
case DW_CFA_advance_loc2:
start += 2;
break;
case DW_CFA_advance_loc4:
start += 4;
break;
case DW_CFA_offset_extended:
reg = LEB (); LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_restore_extended:
reg = LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_undefined:
reg = LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_same_value:
reg = LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_register:
reg = LEB (); LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_def_cfa:
LEB (); LEB ();
break;
case DW_CFA_def_cfa_register:
LEB ();
break;
case DW_CFA_def_cfa_offset:
LEB ();
break;
#ifndef DW_CFA_GNU_args_size
#define DW_CFA_GNU_args_size 0x2e
#endif
case DW_CFA_GNU_args_size:
LEB ();
break;
case DW_CFA_GNU_args_size:
LEB ();
break;
#ifndef DW_CFA_GNU_negative_offset_extended
#define DW_CFA_GNU_negative_offset_extended 0x2f
#endif
case DW_CFA_GNU_negative_offset_extended:
reg = LEB (); LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
case DW_CFA_GNU_negative_offset_extended:
reg = LEB (); LEB ();
frame_need_space (fc, reg);
fc->col_type[reg] = DW_CFA_undefined;
default:
break;
}
}
start = tmp;
}
default:
break;
}
}
start = tmp;
}
/* Now we know what registers are used, make a second pass over
the chunk, this time actually printing out the info. */
@ -8485,16 +8485,16 @@ display_debug_frames (section, start, file)
if (op & 0xc0)
op &= 0xc0;
/* Warning: if you add any more cases to this switch, be
sure to add them to the corresponding switch above. */
/* Warning: if you add any more cases to this switch, be
sure to add them to the corresponding switch above. */
switch (op)
{
case DW_CFA_advance_loc:
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
frame_display_row (fc, &need_col_headers, &max_regs);
else
printf (" DW_CFA_advance_loc: %d to %08lx\n",
opa * fc->code_factor,
printf (" DW_CFA_advance_loc: %d to %08lx\n",
opa * fc->code_factor,
fc->pc_begin + opa * fc->code_factor);
fc->pc_begin += opa * fc->code_factor;
break;
@ -8502,7 +8502,7 @@ display_debug_frames (section, start, file)
case DW_CFA_offset:
roffs = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_offset: r%d at cfa%+ld\n",
printf (" DW_CFA_offset: r%d at cfa%+ld\n",
opa, roffs * fc->data_factor);
fc->col_type[opa] = DW_CFA_offset;
fc->col_offset[opa] = roffs * fc->data_factor;
@ -8510,7 +8510,7 @@ display_debug_frames (section, start, file)
case DW_CFA_restore:
if (! do_debug_frames_interp)
printf (" DW_CFA_restore: r%d\n", opa);
printf (" DW_CFA_restore: r%d\n", opa);
fc->col_type[opa] = cie->col_type[opa];
fc->col_offset[opa] = cie->col_offset[opa];
break;
@ -8519,19 +8519,19 @@ display_debug_frames (section, start, file)
vma = byte_get (start, encoded_ptr_size);
start += encoded_ptr_size;
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
frame_display_row (fc, &need_col_headers, &max_regs);
else
printf (" DW_CFA_set_loc: %08lx\n", (unsigned long)vma);
printf (" DW_CFA_set_loc: %08lx\n", (unsigned long)vma);
fc->pc_begin = vma;
break;
case DW_CFA_advance_loc1:
ofs = byte_get (start, 1); start += 1;
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
frame_display_row (fc, &need_col_headers, &max_regs);
else
printf (" DW_CFA_advance_loc1: %ld to %08lx\n",
ofs * fc->code_factor,
printf (" DW_CFA_advance_loc1: %ld to %08lx\n",
ofs * fc->code_factor,
fc->pc_begin + ofs * fc->code_factor);
fc->pc_begin += ofs * fc->code_factor;
break;
@ -8539,10 +8539,10 @@ display_debug_frames (section, start, file)
case DW_CFA_advance_loc2:
ofs = byte_get (start, 2); start += 2;
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
frame_display_row (fc, &need_col_headers, &max_regs);
else
printf (" DW_CFA_advance_loc2: %ld to %08lx\n",
ofs * fc->code_factor,
printf (" DW_CFA_advance_loc2: %ld to %08lx\n",
ofs * fc->code_factor,
fc->pc_begin + ofs * fc->code_factor);
fc->pc_begin += ofs * fc->code_factor;
break;
@ -8550,10 +8550,10 @@ display_debug_frames (section, start, file)
case DW_CFA_advance_loc4:
ofs = byte_get (start, 4); start += 4;
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
frame_display_row (fc, &need_col_headers, &max_regs);
else
printf (" DW_CFA_advance_loc4: %ld to %08lx\n",
ofs * fc->code_factor,
printf (" DW_CFA_advance_loc4: %ld to %08lx\n",
ofs * fc->code_factor,
fc->pc_begin + ofs * fc->code_factor);
fc->pc_begin += ofs * fc->code_factor;
break;
@ -8571,7 +8571,7 @@ display_debug_frames (section, start, file)
case DW_CFA_restore_extended:
reg = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_restore_extended: r%ld\n", reg);
printf (" DW_CFA_restore_extended: r%ld\n", reg);
fc->col_type[reg] = cie->col_type[reg];
fc->col_offset[reg] = cie->col_offset[reg];
break;
@ -8579,7 +8579,7 @@ display_debug_frames (section, start, file)
case DW_CFA_undefined:
reg = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_undefined: r%ld\n", reg);
printf (" DW_CFA_undefined: r%ld\n", reg);
fc->col_type[reg] = DW_CFA_undefined;
fc->col_offset[reg] = 0;
break;
@ -8587,7 +8587,7 @@ display_debug_frames (section, start, file)
case DW_CFA_same_value:
reg = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_same_value: r%ld\n", reg);
printf (" DW_CFA_same_value: r%ld\n", reg);
fc->col_type[reg] = DW_CFA_same_value;
fc->col_offset[reg] = 0;
break;
@ -8596,14 +8596,14 @@ display_debug_frames (section, start, file)
reg = LEB ();
roffs = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_register: r%ld\n", reg);
printf (" DW_CFA_register: r%ld\n", reg);
fc->col_type[reg] = DW_CFA_register;
fc->col_offset[reg] = roffs;
break;
case DW_CFA_remember_state:
if (! do_debug_frames_interp)
printf (" DW_CFA_remember_state\n");
printf (" DW_CFA_remember_state\n");
rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
rs->ncols = fc->ncols;
rs->col_type = (short int *) xmalloc (rs->ncols * sizeof (short int));
@ -8616,7 +8616,7 @@ display_debug_frames (section, start, file)
case DW_CFA_restore_state:
if (! do_debug_frames_interp)
printf (" DW_CFA_restore_state\n");
printf (" DW_CFA_restore_state\n");
rs = remembered_state;
remembered_state = rs->next;
frame_need_space (fc, rs->ncols-1);
@ -8631,25 +8631,25 @@ display_debug_frames (section, start, file)
fc->cfa_reg = LEB ();
fc->cfa_offset = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa: r%d ofs %d\n",
printf (" DW_CFA_def_cfa: r%d ofs %d\n",
fc->cfa_reg, fc->cfa_offset);
break;
case DW_CFA_def_cfa_register:
fc->cfa_reg = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa_reg: r%d\n", fc->cfa_reg);
printf (" DW_CFA_def_cfa_reg: r%d\n", fc->cfa_reg);
break;
case DW_CFA_def_cfa_offset:
fc->cfa_offset = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa_offset: %d\n", fc->cfa_offset);
printf (" DW_CFA_def_cfa_offset: %d\n", fc->cfa_offset);
break;
case DW_CFA_nop:
if (! do_debug_frames_interp)
printf (" DW_CFA_nop\n");
printf (" DW_CFA_nop\n");
break;
#ifndef DW_CFA_GNU_window_save
@ -8657,13 +8657,13 @@ display_debug_frames (section, start, file)
#endif
case DW_CFA_GNU_window_save:
if (! do_debug_frames_interp)
printf (" DW_CFA_GNU_window_save\n");
printf (" DW_CFA_GNU_window_save\n");
break;
case DW_CFA_GNU_args_size:
ul = LEB ();
if (! do_debug_frames_interp)
printf (" DW_CFA_GNU_args_size: %ld\n", ul);
printf (" DW_CFA_GNU_args_size: %ld\n", ul);
break;
case DW_CFA_GNU_negative_offset_extended:
@ -8671,7 +8671,7 @@ display_debug_frames (section, start, file)
l = - LEB ();
frame_need_space (fc, reg);
if (! do_debug_frames_interp)
printf (" DW_CFA_GNU_negative_offset_extended: r%ld at cfa%+ld\n",
printf (" DW_CFA_GNU_negative_offset_extended: r%ld at cfa%+ld\n",
reg, l * fc->data_factor);
fc->col_type[reg] = DW_CFA_offset;
fc->col_offset[reg] = l * fc->data_factor;
@ -8684,7 +8684,7 @@ display_debug_frames (section, start, file)
}
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
frame_display_row (fc, &need_col_headers, &max_regs);
start = block_end;
}
@ -8823,11 +8823,11 @@ process_section_contents (file)
int j;
if (section->sh_size == 0)
continue;
continue;
/* See if there is some pre-scan operation for this section. */
for (j = NUM_ELEM (debug_displays); j--;)
if (strcmp (debug_displays[j].name, name) == 0)
if (strcmp (debug_displays[j].name, name) == 0)
{
if (debug_displays[j].prescan != NULL)
{
@ -8845,8 +8845,8 @@ process_section_contents (file)
free (start);
}
break;
}
break;
}
}
for (i = 0, section = section_headers;
@ -9374,7 +9374,7 @@ get_netbsd_elfcore_note_type (e_type)
If the value of namesz is zero, there is no name present. */
static int
process_note (pnote)
Elf32_Internal_Note * pnote;
Elf32_Internal_Note * pnote;
{
const char *nt;

6
binutils/rename.c
View File

@ -165,8 +165,8 @@ smart_rename (from, to, preserve_dates)
ret = rename (from, to);
if (ret != 0)
{
/* We have to clean up here. */
/* We have to clean up here. */
non_fatal (_("%s: rename: %s"), to, strerror (errno));
unlink (from);
}
@ -199,7 +199,7 @@ smart_rename (from, to, preserve_dates)
}
else
{
/* We have to clean up here. */
/* We have to clean up here. */
non_fatal (_("%s: rename: %s"), to, strerror (errno));
unlink (from);
}

28
binutils/resbin.c
View File

@ -487,7 +487,7 @@ bin_to_res_dialog (data, length, big_endian)
else
{
int version;
version = get_16 (big_endian, data);
if (version != 1)
fatal (_("unexpected DIALOGEX version %d"), version);
@ -518,7 +518,7 @@ bin_to_res_dialog (data, length, big_endian)
d->caption = get_unicode (data + off, length - off, big_endian, &sublen);
off += sublen * 2 + 2;
if (sublen == 0)
if (sublen == 0)
d->caption = NULL;
if ((d->style & DS_SETFONT) == 0)
@ -595,9 +595,9 @@ bin_to_res_dialog (data, length, big_endian)
dc->height = get_16 (big_endian, data + off + 6);
if (d->ex != NULL)
dc->id = get_32 (big_endian, data + off + 8);
dc->id = get_32 (big_endian, data + off + 8);
else
dc->id = get_16 (big_endian, data + off + 8);
dc->id = get_16 (big_endian, data + off + 8);
off += 10 + (d->ex != NULL ? 2 : 0);
@ -629,7 +629,7 @@ bin_to_res_dialog (data, length, big_endian)
dc->data->u.buffer.length = datalen;
dc->data->u.buffer.data = data + off;
off += datalen;
off += datalen;
}
dc->next = NULL;
@ -1219,7 +1219,7 @@ bin_to_res_version (data, length, big_endian)
vi->next = NULL;
*pp = vi;
pp = &vi->next;
pp = &vi->next;
}
v = (struct versioninfo *) res_alloc (sizeof *v);
@ -1230,7 +1230,7 @@ bin_to_res_version (data, length, big_endian)
r->type = RES_TYPE_VERSIONINFO;
r->u.versioninfo = v;
return r;
return r;
}
/* Convert an arbitrary user defined resource from binary. */
@ -1685,9 +1685,9 @@ res_to_bin_dialog (dialog, big_endian)
put_16 (big_endian, dc->height, d->data + dcoff + 6);
if (dialogex)
put_32 (big_endian, dc->id, d->data + dcoff + 8);
put_32 (big_endian, dc->id, d->data + dcoff + 8);
else
put_16 (big_endian, dc->id, d->data + dcoff + 8);
put_16 (big_endian, dc->id, d->data + dcoff + 8);
*pp = d;
pp = &d->next;
@ -1776,12 +1776,12 @@ res_to_bin_fontdir (fontdirs, big_endian)
d->next = NULL;
*pp = d;
pp = &d->next;
pp = &d->next;
}
put_16 (big_endian, c, first->data);
return first;
return first;
}
/* Convert a group icon resource to binary. */
@ -2093,7 +2093,7 @@ res_to_bin_stringtable (st, big_endian)
d->next = NULL;
*pp = d;
pp = &d->next;
pp = &d->next;
}
return first;
@ -2122,7 +2122,7 @@ string_to_unicode_bin (s, big_endian)
d->next = NULL;
return d;
return d;
}
/* Convert a versioninfo resource to binary. */
@ -2287,7 +2287,7 @@ res_to_bin_versioninfo (versioninfo, big_endian)
vsslen += length - hold;
*pp = unicode_to_bin (vs->value, big_endian);
put_16 (big_endian, (*pp)->length / 2, vssd->data + 2);
put_16 (big_endian, (*pp)->length / 2, vssd->data + 2);
length += (*pp)->length;
vilen += (*pp)->length;
vslen += (*pp)->length;

52
binutils/resrc.c
View File

@ -70,7 +70,7 @@
#ifndef STDOUT_FILENO
#define STDOUT_FILENO 1
#endif
#if defined (_WIN32) && ! defined (__CYGWIN__)
#define popen _popen
#define pclose _pclose
@ -193,38 +193,38 @@ run_cmd (cmd, redir)
/* Count the args. */
i = 0;
for (s = cmd; *s; s++)
if (*s == ' ')
i++;
i++;
argv = alloca (sizeof (char *) * (i + 3));
i = 0;
s = cmd;
while (1)
{
while (*s == ' ' && *s != 0)
s++;
if (*s == 0)
break;
in_quote = (*s == '\'' || *s == '"');
sep = (in_quote) ? *s++ : ' ';
argv[i++] = s;
while (*s != sep && *s != 0)
s++;
if (*s == 0)
break;
*s++ = 0;
if (in_quote)
s++;
s++;
}
argv[i++] = NULL;
@ -237,8 +237,8 @@ run_cmd (cmd, redir)
/* Open temporary output file. */
redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, 0666);
if (redir_handle == -1)
fatal (_("can't open temporary file `%s': %s"), redir,
strerror (errno));
fatal (_("can't open temporary file `%s': %s"), redir,
strerror (errno));
/* Duplicate the stdout file handle so it can be restored later. */
stdout_save = dup (STDOUT_FILENO);
@ -265,7 +265,7 @@ run_cmd (cmd, redir)
retcode = 0;
pid = pwait (pid, &wait_status, 0);
if (pid == -1)
{
fatal (_("wait: %s"), strerror (errno));
@ -280,14 +280,14 @@ run_cmd (cmd, redir)
{
if (WEXITSTATUS (wait_status) != 0)
{
fatal (_("%s exited with status %d"), cmd,
fatal (_("%s exited with status %d"), cmd,
WEXITSTATUS (wait_status));
retcode = 1;
}
}
else
retcode = 1;
return retcode;
}
@ -309,11 +309,11 @@ open_input_stream (cmd)
cpp_pipe = fopen (cpp_temp_file, FOPEN_RT);;
if (cpp_pipe == NULL)
fatal (_("can't open temporary file `%s': %s"),
fatal (_("can't open temporary file `%s': %s"),
cpp_temp_file, strerror (errno));
if (verbose)
fprintf (stderr,
fprintf (stderr,
_("Using temporary file `%s' to read preprocessor output\n"),
cpp_temp_file);
}
@ -321,7 +321,7 @@ open_input_stream (cmd)
{
cpp_pipe = popen (cmd, FOPEN_RT);
if (cpp_pipe == NULL)
fatal (_("can't popen `%s': %s"), cmd, strerror (errno));
fatal (_("can't popen `%s': %s"), cmd, strerror (errno));
if (verbose)
fprintf (stderr, _("Using popen to read preprocessor output\n"));
}
@ -472,7 +472,7 @@ read_rc_file (filename, preprocessor, preprocargs, language, use_temp_file)
}
}
free (cmd);
rc_filename = xstrdup (filename);
@ -484,7 +484,7 @@ read_rc_file (filename, preprocessor, preprocargs, language, use_temp_file)
rcparse_discard_strings ();
close_input_stream ();
if (fontdirs != NULL)
define_fontdirs ();
@ -507,7 +507,7 @@ close_input_stream ()
if (cpp_temp_file != NULL)
{
int errno_save = errno;
unlink (cpp_temp_file);
errno = errno_save;
free (cpp_temp_file);
@ -1593,7 +1593,7 @@ write_rc_directory (e, rd, type, name, language, level)
&& (re->id.u.id & 0xffff) == re->id.u.id)
{
fprintf (e, "LANGUAGE %lu, %lu\n",
re->id.u.id & ((1 << SUBLANG_SHIFT) - 1),
re->id.u.id & ((1 << SUBLANG_SHIFT) - 1),
(re->id.u.id >> SUBLANG_SHIFT) & 0xff);
*language = re->id.u.id;
}
@ -1699,7 +1699,7 @@ write_rc_subdir (e, re, type, name, language, level)
fprintf (e, "// Level %d: ", level);
res_id_print (e, re->id, 1);
fprintf (e, "\n");
}
}
write_rc_directory (e, re->u.dir, type, name, language, level + 1);
}
@ -2167,7 +2167,7 @@ write_rc_dialog_control (e, control)
fprintf (e, "%s", ci->name);
else
fprintf (e, "CONTROL");
if (control->text.named || control->text.u.id != 0)
{
fprintf (e, " ");

4
binutils/resres.c
View File

@ -211,7 +211,7 @@ write_res_directory (rd, type, name, language, level)
case 2:
/* If we're at level 2, the key of this resource is the name
we are going to use in the rc printout. */
we are going to use in the rc printout. */
name = &re->id;
break;
@ -457,7 +457,7 @@ write_res_info (info)
}
/* read a resource identifier */
void
void
read_res_id (id)
struct res_id *id;
{

Write Preview
Loading…
Cancel
Save