===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pmdb/Attic/elf_syms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/pmdb/Attic/elf_syms.c	2002/03/15 16:41:06	1.2
--- src/usr.bin/pmdb/Attic/elf_syms.c	2002/03/15 17:49:51	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: elf_syms.c,v 1.2 2002/03/15 16:41:06 jason Exp $	*/
  /*
   * Copyright (c) 2002 Artur Grabowski <art@openbsd.org>
   * All rights reserved. 
--- 1,4 ----
! /*	$OpenBSD: elf_syms.c,v 1.3 2002/03/15 17:49:51 art Exp $	*/
  /*
   * Copyright (c) 2002 Artur Grabowski <art@openbsd.org>
   * All rights reserved. 
***************
*** 56,62 ****
  	Elf_Word	esh_strsize;
  	Elf_Sym 	*esh_symtab;
  	Elf_Word	esh_symsize;
- 	Elf_Addr	esh_offs;
  };
  
  #define ESH_TO_ST(esh) (&(esh)->esh_st)
--- 56,61 ----
***************
*** 203,209 ****
  	int nsyms, i;
  	char *symn;
  
! #define SYMVAL(S) (unsigned long)((S)->st_value + esh->esh_offs)
  
  	nsyms = esh->esh_symsize / sizeof(Elf_Sym);
  
--- 202,208 ----
  	int nsyms, i;
  	char *symn;
  
! #define SYMVAL(S) (unsigned long)((S)->st_value + st->st_offs)
  
  	nsyms = esh->esh_symsize / sizeof(Elf_Sym);
  
***************
*** 266,272 ****
  	}
  
  	if (s != NULL) {
! 		*res = s->st_value + ST_TO_ESH(st)->esh_offs;
  		return (0);
  	}
  
--- 265,271 ----
  	}
  
  	if (s != NULL) {
! 		*res = s->st_value + st->st_offs;
  		return (0);
  	}
  
***************
*** 319,325 ****
  #ifndef __NetBSD__
  	pid_t pid = ps->ps_pid;
  	struct elf_object_v1 eobj;
- 	struct sym_table *st;
  	struct r_debug rdeb;
  	reg addr;
  	Elf_Dyn dyn;
--- 318,323 ----
***************
*** 330,336 ****
  		warnx("Can't find _DYNAMIC");
  		return;
  	}
! 	addr = s->st_value + ST_TO_ESH(ps->ps_sym_exe)->esh_offs;
  
  	do {
  		if (read_from_pid(pid, addr, &dyn, sizeof(dyn)) < 0) {
--- 328,334 ----
  		warnx("Can't find _DYNAMIC");
  		return;
  	}
! 	addr = s->st_value + ps->ps_sym_exe->st_offs;
  
  	do {
  		if (read_from_pid(pid, addr, &dyn, sizeof(dyn)) < 0) {
***************
*** 392,403 ****
  		if (i == MAXPATHLEN)
  			continue;
  
! 		st = st_open(ps, fname);
! 		if (st == NULL) {
  			warn("symbol loading failed");
- 			continue;
- 		}
- 		ST_TO_ESH(st)->esh_offs = eobj.load_offs;
  	}
  #endif
  }
--- 390,397 ----
  		if (i == MAXPATHLEN)
  			continue;
  
! 		if (st_open(ps, fname, eobj.load_offs) == NULL)
  			warn("symbol loading failed");
  	}
  #endif
  }