diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-17 07:23:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-17 07:23:28 +0000 |
| commit | 394224fb955692f3460068ca21d5ebb2e2172aa2 (patch) | |
| tree | 64ace0ef2ae061c3088c552b07b18a5e9b117337 | |
| parent | 2d4ee03ca75f9549f1cb0e430dd97b495181d01b (diff) | |
further steps towards unification
| -rw-r--r-- | distrib/common/elfrdsetroot.c | 11 | ||||
| -rw-r--r-- | distrib/common/rdsetroot.c | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/distrib/common/elfrdsetroot.c b/distrib/common/elfrdsetroot.c index d1678f8679a..8577531e291 100644 --- a/distrib/common/elfrdsetroot.c +++ b/distrib/common/elfrdsetroot.c @@ -1,12 +1,11 @@ -/* $OpenBSD: elfrdsetroot.c,v 1.20 2008/12/09 18:57:41 deraadt Exp $ */ +/* $OpenBSD: elfrdsetroot.c,v 1.21 2009/04/17 07:23:26 deraadt Exp $ */ /* $NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1997 Per Fogelstrom. (ELF modifications) * All rights reserved. * - * ELF modifications Copyright (c) 1997 Per Fogelstrom. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -266,15 +265,15 @@ find_rd_root_image(char *file, Elf_Phdr *ph, int segment) * Sanity check locations of db_* symbols */ if (rd_root_image_off < 0 || rd_root_image_off >= kernel_size) - return(0); + return (0); if (rd_root_size_off < 0 || rd_root_size_off >= kernel_size) { fprintf(stderr, "%s: rd_root_size not in data segment?\n", file); - return(0); + return (0); } mmap_off = ph->p_offset; mmap_size = kernel_size; - return(1); + return (1); } __dead void diff --git a/distrib/common/rdsetroot.c b/distrib/common/rdsetroot.c index 0aaa82e1756..6b48b8237dd 100644 --- a/distrib/common/rdsetroot.c +++ b/distrib/common/rdsetroot.c @@ -1,8 +1,9 @@ -/* $OpenBSD: rdsetroot.c,v 1.19 2008/12/09 18:57:42 deraadt Exp $ */ +/* $OpenBSD: rdsetroot.c,v 1.20 2009/04/17 07:23:27 deraadt Exp $ */ /* $NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1997 Per Fogelstrom. (ELF modifications) * All rights reserved. * * Redistribution and use in source and binary forms, with or without |