diff options
Diffstat (limited to 'usr/src/cmd')
32 files changed, 200 insertions, 220 deletions
diff --git a/usr/src/cmd/audio/utilities/Makefile b/usr/src/cmd/audio/utilities/Makefile index 2b6097c0e6..bc50c948af 100644 --- a/usr/src/cmd/audio/utilities/Makefile +++ b/usr/src/cmd/audio/utilities/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# # Makefile for C++ Audio Library (libAudio.a) include ../../Makefile.cmd @@ -38,7 +36,7 @@ CFLAGS += $(CCVERBOSE) LINTFLAGS += -m -v -u -AR= /usr/ccs/bin/ar cq +AR= /usr/ccs/bin/ar RANLIB= /usr/ccs/bin/ranlib RM= /usr/bin/rm -f @@ -88,7 +86,7 @@ install all: $(libaudio) $(libaudio): $(COBJS) $(CCOBJS) $(RM) -f $@ - $(AR) $@ $(COBJS) $(CCOBJS) + $(AR) cq $@ $(COBJS) $(CCOBJS) test ! -f $(RANLIB) || $(RANLIB) $@ clean: diff --git a/usr/src/cmd/bnu/grades.c b/usr/src/cmd/bnu/grades.c index 203a8d9a70..9a7fbee731 100644 --- a/usr/src/cmd/bnu/grades.c +++ b/usr/src/cmd/bnu/grades.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -23,12 +22,10 @@ /* All Rights Reserved */ /* - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#ident "%Z%%M% %I% %E% SMI" /* from SVR4 bnu:grades.c 1.7 */ - #include "uucp.h" #include <grp.h> @@ -314,6 +311,8 @@ struct cs_struct *scfile; return(SUCCESS); } +static void lcase(); + /* * jsize - determines whether if a job is small enough to * be placed in the appropiate queue. @@ -336,7 +335,6 @@ long *nlimit; #define ONE_K (1024) #define ONE_MEG ((1024)*(1024)) - static void lcase(); char rest[SMBUF]; char msg[BUFSIZ], *p; @@ -553,7 +551,6 @@ int na; #define G_GRP "group" #define G_NGRP "non-group" - static void lcase(); char actn[SMBUF]; char ufld[SMBUF]; char msg[BUFSIZ]; diff --git a/usr/src/cmd/bnu/uucico.c b/usr/src/cmd/bnu/uucico.c index ac3f721447..76a0aa3ba4 100644 --- a/usr/src/cmd/bnu/uucico.c +++ b/usr/src/cmd/bnu/uucico.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,8 +27,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * uucp file transfer program: @@ -79,6 +76,8 @@ static void checkrmt(); /* See if we want to talk to remote. */ extern char *Mytype; +static char *pskip(); + int main(argc, argv, envp) int argc; @@ -87,7 +86,6 @@ char **envp; { extern void intrEXIT(), onintr(), timeout(); - static char *pskip(); extern void setservice(); #ifndef ATTSVR3 void setTZ(); diff --git a/usr/src/cmd/bnu/uucp.c b/usr/src/cmd/bnu/uucp.c index 2c57d7e61b..4a23f398b4 100644 --- a/usr/src/cmd/bnu/uucp.c +++ b/usr/src/cmd/bnu/uucp.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,15 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "uucp.h" /* @@ -472,6 +469,7 @@ int code; exit(code); } +static FILE *syscfile(); /* * generate copy files for s1!f1 -> s2!f2 * Note: only one remote machine, other situations @@ -485,7 +483,6 @@ copy(s1, f1, s2, f2) char *s1, *f1, *s2, *f2; { FILE *cfp; - static FILE *syscfile(); struct stat stbuf, stbuf1; int type, statret; char dfile[NAMESIZE]; diff --git a/usr/src/cmd/bnu/uux.c b/usr/src/cmd/bnu/uux.c index 28f1c6ff22..e2d8994044 100644 --- a/usr/src/cmd/bnu/uux.c +++ b/usr/src/cmd/bnu/uux.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,8 +27,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "uucp.h" #define SHORTBUF 64 @@ -61,6 +58,7 @@ static int _Statop; char Sgrade[NAMESIZE]; void cleanup(); static void usage(); +static void onintr(); /* * uux @@ -73,7 +71,6 @@ char *envp[]; { char *jid(); FILE *fprx = NULL, *fpc = NULL, *fpd = NULL, *fp = NULL; - static void onintr(); int cfileUsed = 0; /* >0 if commands put in C. file flag */ int cflag = 0; /* if > 0 make local copy of files to be sent */ int nflag = 0; /* if != 0, do not request error notification */ diff --git a/usr/src/cmd/dfs.cmds/general/general.c b/usr/src/cmd/dfs.cmds/general/general.c index 3b13807dbb..cb84d4d3a7 100644 --- a/usr/src/cmd/dfs.cmds/general/general.c +++ b/usr/src/cmd/dfs.cmds/general/general.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -24,12 +23,10 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * generic interface to dfs commands. * @@ -57,6 +54,7 @@ /* cmd name, -o, opts, (char *)0 terminator */ static char *getfs(); +static int invalid(); void perror(); int @@ -64,7 +62,6 @@ main(argc, argv) int argc; char **argv; { - static int invalid(); extern char *optarg; extern int optind; FILE *dfp; /* fp for dfs list */ diff --git a/usr/src/cmd/fm/fmd/common/fmd_mdb.c b/usr/src/cmd/fm/fmd/common/fmd_mdb.c index a9e89d37bc..517e585960 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_mdb.c +++ b/usr/src/cmd/fm/fmd/common/fmd_mdb.c @@ -1167,11 +1167,11 @@ fcf_hdr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) return (DCMD_OK); } +static int fcf_sec(uintptr_t, uint_t, int, const mdb_arg_t *); /*ARGSUSED*/ static int fcf_sec_one(uintptr_t addr, void *ignored, uint_t *secp) { - static int fcf_sec(uintptr_t, uint_t, int, const mdb_arg_t *); mdb_printf("%3d ", (*secp)++); (void) fcf_sec(addr, DCMD_ADDRSPEC | DCMD_LOOP, 0, NULL); diff --git a/usr/src/cmd/fmli/menu/mcurrent.c b/usr/src/cmd/fmli/menu/mcurrent.c index 23aa72feac..c93af3782e 100644 --- a/usr/src/cmd/fmli/menu/mcurrent.c +++ b/usr/src/cmd/fmli/menu/mcurrent.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,15 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 1997 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <curses.h> #include "wish.h" @@ -92,6 +89,8 @@ menu_noncurrent() return SUCCESS; } +static void menu_show(); + void menu_index(m, newindex, hcols) register struct menu *m; @@ -110,7 +109,6 @@ int hcols; int scol; int sind; struct menu_line ml; - static void menu_show(); vt_ctl(m->vid, CTGETSIZ, &rows, &cols); huse = min(m->hwidth, cwidth = (cols - 1) / m->ncols); diff --git a/usr/src/cmd/fmli/menu/stmenu.c b/usr/src/cmd/fmli/menu/stmenu.c index 7492899cd3..1a248412b5 100644 --- a/usr/src/cmd/fmli/menu/stmenu.c +++ b/usr/src/cmd/fmli/menu/stmenu.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -21,15 +20,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <ctype.h> #include "wish.h" @@ -529,6 +526,9 @@ _menu_cleanup() curstring = NULL; } +static void strtolower(); +static int nocase_strncmp(); + static int menu_match(m, s, n, t) register struct menu *m; @@ -540,8 +540,6 @@ token t; register int start; register int count; register char *p; - static void strtolower(); - static int nocase_strncmp(); char badmatch[PATHSIZ]; start = m->index; diff --git a/usr/src/cmd/fmli/oh/if_form.c b/usr/src/cmd/fmli/oh/if_form.c index b4aee060c8..bb951f44ae 100644 --- a/usr/src/cmd/fmli/oh/if_form.c +++ b/usr/src/cmd/fmli/oh/if_form.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -29,8 +28,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <ctype.h> #include <stdio.h> #include <string.h> @@ -980,6 +977,8 @@ char *str; return(FAIL); } +static int chk_page(); + /* * CHK_FORM returns the actual number of the FIRST field that * is invalid .... @@ -989,7 +988,6 @@ chk_form() { register int n, page, fldnum; int savefield, savepage, retval; - static int chk_page(); /* * Save current form page/field diff --git a/usr/src/cmd/fmli/oh/if_init.c b/usr/src/cmd/fmli/oh/if_init.c index cfaf5ff5f1..b98f48db5d 100644 --- a/usr/src/cmd/fmli/oh/if_init.c +++ b/usr/src/cmd/fmli/oh/if_init.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -21,15 +20,13 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <curses.h> #include <string.h> @@ -227,6 +224,9 @@ char *strnsave(); static int settoggle(); static struct fm_mn Inits; +static char *set_default(); +static int center_it(); + /* ** Front-end to parser(), which sets up defaults. */ @@ -236,8 +236,6 @@ char *initfile; { register int i, numslks; char *permmsg, *get_def(); - static char *set_default(); - static int center_it(); static int free_inits = FALSE; int sbutton; FILE *fp; diff --git a/usr/src/cmd/fmli/oh/scram.c b/usr/src/cmd/fmli/oh/scram.c index bf644aba0e..1b265bec20 100644 --- a/usr/src/cmd/fmli/oh/scram.c +++ b/usr/src/cmd/fmli/oh/scram.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -29,8 +28,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <curses.h> #define _SYS_TERMIO_H /* sys/termio.h is included by curses.h */ #include <fcntl.h> @@ -69,6 +66,7 @@ static int pack(); static int unpack(); static int keysave(); static int keyvalid(); +static void regetkey(); /* * scram -- Scramble an object and pack all its parts into an OEU package @@ -77,7 +75,6 @@ int scram(file) register char *file; { - static void regetkey(); strcpy(Keyprompt, "Please enter scramble key: "); strcpy(Srcfile, file); @@ -124,7 +121,6 @@ token t; { struct ott_entry *entry, *path_to_ott(); struct stat buf; - static void regetkey(); if (t == TOK_CANCEL) return (SUCCESS); @@ -343,7 +339,7 @@ struct ott_entry *entry; n = m + m; tempstr[0] = Keycheck[n]; tempstr[1] = Keycheck[n+1]; - buf[m] = (int) strtol(tempstr, NULL, 16); + buf[m] = (int)strtol(tempstr, NULL, 16); } if (cryptit(buf) == FAIL) @@ -371,7 +367,7 @@ mkencrypart() unsigned int left, right; time_t clock; /* EFT abs k16 */ - clock = time((time_t *) 0); /* EFT abs k16 */ + clock = time((time_t *)0); /* EFT abs k16 */ right = clock & 0177; buf[0] = right; diff --git a/usr/src/cmd/fmli/oh/slk.c b/usr/src/cmd/fmli/oh/slk.c index 52f6c7226b..8e0f9cfe84 100644 --- a/usr/src/cmd/fmli/oh/slk.c +++ b/usr/src/cmd/fmli/oh/slk.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,15 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* microsecond delay timer not available before SVR4.0 abs k18 */ #ifdef PRE_SVR4_COMPILE #define DO_NOT_DELAY @@ -504,6 +501,8 @@ setup_slk_array() #define REDEFINED(x) ((x).label && (*((x).label) != '\0' || (x).tok < 0)) +static void showslks(); + /* * SETSLKS will make "slks" the currently displayed SLKS */ @@ -513,7 +512,6 @@ struct slk slks[]; int flag; { register int i, more_slks; - static void showslks(); #ifdef _DEBUG _debug(stderr, "in setslk!\n"); diff --git a/usr/src/cmd/fmli/qued/multiline.c b/usr/src/cmd/fmli/qued/multiline.c index 2999a61c11..906320f629 100644 --- a/usr/src/cmd/fmli/qued/multiline.c +++ b/usr/src/cmd/fmli/qued/multiline.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,6 +18,11 @@ * * CDDL HEADER END */ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -27,7 +31,6 @@ * Copyright (c) 1985 AT&T * All Rights Reserved */ -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.11 */ #include <stdio.h> #include <ctype.h> @@ -39,6 +42,7 @@ static token _fixed(); static token _virtual(); +static int emptyrow(); #define SCROLLSIZE ((Cfld->rows - 2 <= 0) ? 1 : Cfld->rows - 2) #define HALFSIZE (int)(Cfld->rows / 2) @@ -58,7 +62,6 @@ token tok; { register token rettok; register int col; - static int emptyrow(); rettok = TOK_NOP; switch (tok) { diff --git a/usr/src/cmd/ldapcachemgr/cachemgr.c b/usr/src/cmd/ldapcachemgr/cachemgr.c index 5d57b36dcc..3abb73734a 100644 --- a/usr/src/cmd/ldapcachemgr/cachemgr.c +++ b/usr/src/cmd/ldapcachemgr/cachemgr.c @@ -270,6 +270,8 @@ server_destroy(void *arg) (void) mutex_unlock(&create_lock); } +static void client_killserver(); + int main(int argc, char ** argv) { @@ -282,7 +284,6 @@ main(int argc, char ** argv) struct stat buf; sigset_t myset; struct sigaction sighupaction; - static void client_killserver(); int debug_level = 0; /* setup for localization */ diff --git a/usr/src/cmd/mailx/hdr/glob.h b/usr/src/cmd/mailx/hdr/glob.h index 01dcf5b317..d46fc5a3f3 100644 --- a/usr/src/cmd/mailx/hdr/glob.h +++ b/usr/src/cmd/mailx/hdr/glob.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -22,10 +21,9 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* @@ -38,7 +36,8 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" +#ifndef _HDR_GLOB_H +#define _HDR_GLOB_H /* * mailx -- a modified version of a University of California at Berkeley @@ -69,7 +68,6 @@ extern char *editfile; /* Name of file being edited */ extern int exitflg; /* -e for mail test */ extern NODE *fplist; /* ???? */ extern struct grouphead *groups[]; /* Pointer to active groups */ -extern struct hdr header[]; /* Known header types */ extern int hflag; /* Sequence number for network -h */ extern char homedir[]; /* Name of home directory */ extern char host[]; /* ???? */ @@ -82,7 +80,7 @@ extern FILE *itf; /* Input temp file buffer */ extern int lexnumber; /* Number of TNUMBER from scan() */ extern char lexstring[]; /* String from TSTRING, scan() */ extern int loading; /* Loading user definitions */ -extern char *lockname; /* named used for locking in /var/mail */ +extern char *lockname; /* named used for /var/mail locking */ extern char *maildir; /* directory for mail files */ extern char mailname[]; /* Name of /var/mail system mailbox */ extern off_t mailsize; /* Size of system mailbox */ @@ -112,7 +110,7 @@ extern int rcvmode; /* True if receiving mail */ extern int readonly; /* Will be unable to rewrite file */ extern int regretp; /* Pointer to TOS of regret tokens */ extern int regretstack[]; /* Stack of regretted tokens */ -extern struct ignore *retain[HSHSIZE];/* Pointer to retained fields */ +extern struct ignore *retain[HSHSIZE]; /* Pointer to retained fields */ extern char *rflag; /* -r address for network */ extern int rmail; /* Being called as rmail */ extern int sawcom; /* Set after first command */ @@ -143,3 +141,5 @@ extern int receipt_flg; /* Flag for return receipt */ */ extern char *optarg; extern int optind; + +#endif /* _HDR_GLOB_H */ diff --git a/usr/src/cmd/mdb/common/libstand/ctime.c b/usr/src/cmd/mdb/common/libstand/ctime.c index c050888392..637e810019 100644 --- a/usr/src/cmd/mdb/common/libstand/ctime.c +++ b/usr/src/cmd/mdb/common/libstand/ctime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -9,8 +9,6 @@ * specifies the terms and conditions for redistribution. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This localtime is a modified version of offtime from libc, which does not * bother to figure out the time zone from the kernel, from environment @@ -149,6 +147,8 @@ localtime(const time_t *clock) #define dysize(A) (((A)%4)? 365: 366) #define CBUFSIZ 26 +static char *ct_numb(); + /* * POSIX.1c standard version of the function asctime_r. * User gets it via static asctime_r from the header file. @@ -159,7 +159,6 @@ __posix_asctime_r(const struct tm *t, char *cbuf) const char *Date = "Day Mon 00 00:00:00 1900\n"; const char *Day = "SunMonTueWedThuFriSat"; const char *Month = "JanFebMarAprMayJunJulAugSepOctNovDec"; - static char *ct_numb(); const char *ncp; const int *tp; char *cp; diff --git a/usr/src/cmd/mdb/common/mdb/mdb_lex.l b/usr/src/cmd/mdb/common/mdb/mdb_lex.l index b3c662b5ff..4182cdc818 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_lex.l +++ b/usr/src/cmd/mdb/common/mdb/mdb_lex.l @@ -5,9 +5,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -22,12 +21,10 @@ * * CDDL HEADER END * - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/isa_defs.h> @@ -57,7 +54,7 @@ * to shut the linker up. */ #ifdef _KMDB -static FILE __iob[_NFILE]; +FILE __iob[_NFILE]; #endif /* diff --git a/usr/src/cmd/pcmciad/pcmciad.c b/usr/src/cmd/pcmciad/pcmciad.c index d99ca96101..1489eb5d5d 100644 --- a/usr/src/cmd/pcmciad/pcmciad.c +++ b/usr/src/cmd/pcmciad/pcmciad.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * PCMCIA User Daemon * This is a newer daemon than the original version. @@ -1304,6 +1302,7 @@ setup_autopush(char *driver) static void unmount_media(long, char *); static void signal_vold(long, char *); +static void makepdir(); int volmgt_running(); char *media_findname(char *); @@ -1315,7 +1314,6 @@ char *media_findname(char *); static void meminit() { - static void makepdir(); #ifndef lint mutex_lock(&meminit_lock); @@ -1579,6 +1577,7 @@ get_devrdsk(long socket, char *path, char *device_type) return (found ? namebuf : NULL); } +static void start_unmount(char *, char *); /* * unmount_media - Unmount PCMCIA media file system * @@ -1589,7 +1588,6 @@ get_devrdsk(long socket, char *path, char *device_type) static void unmount_media(long socket, char *device_type) { - static void start_unmount(char *, char *); static FILE *fp = NULL; struct mnttab mnt; const char *nvp; @@ -1644,6 +1642,9 @@ out: (void) fclose(fp); } +static int req_vold_umount(char *); +static int do_umount(char *); + /* * start_unmount - Start to unmount mounting directory * @@ -1653,8 +1654,6 @@ out: static void start_unmount(char *mnt_special, char *mnt_mountp) { - static int req_vold_umount(char *); - static int do_umount(char *); int err = 0; /* @@ -1883,14 +1882,15 @@ dun: } +static void wr_to_pipe(char *, char *, int); +static const char *get_rdsk_path(char *); + /* * signal_vold - tell vold that a new path has been added */ static void signal_vold(long socket, char *device) { - static void wr_to_pipe(char *, char *, int); - static const char *get_rdsk_path(char *); const char *rpath; diff --git a/usr/src/cmd/pg/pg.c b/usr/src/cmd/pg/pg.c index 5a1767420c..22f54c6886 100644 --- a/usr/src/cmd/pg/pg.c +++ b/usr/src/cmd/pg/pg.c @@ -20,15 +20,13 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <signal.h> #include <setjmp.h> #include <sys/types.h> @@ -859,7 +857,6 @@ ttyin() int state = 0; int width, length; char multic[MB_LEN_MAX]; - static int readch(); int len; (void) fixterm(); diff --git a/usr/src/cmd/rpcgen/rpc_main.c b/usr/src/cmd/rpcgen/rpc_main.c index d8ea6896d5..b949bb680e 100644 --- a/usr/src/cmd/rpcgen/rpc_main.c +++ b/usr/src/cmd/rpcgen/rpc_main.c @@ -546,6 +546,19 @@ h_output(char *infile, char *define, int extend, char *outfile) /* put in a typedef for quadprecision. Only with Cflag */ + /* + * declaration of struct rpcgen_table must go before + * the definition of arrays like *_1_table[] + */ + if (tblflag) { + f_print(fout, rpcgen_table_dcl1); + if (tirpcflag) + f_print(fout, rpcgen_table_proc); + else + f_print(fout, rpcgen_table_proc_b); + f_print(fout, rpcgen_table_dcl2); + } + tell = ftell(fout); /* print data definitions */ @@ -597,13 +610,6 @@ h_output(char *infile, char *define, int extend, char *outfile) if (extend && tell == ftell(fout)) { (void) unlink(outfilename); - } else if (tblflag) { - f_print(fout, rpcgen_table_dcl1); - if (tirpcflag) - f_print(fout, rpcgen_table_proc); - else - f_print(fout, rpcgen_table_proc_b); - f_print(fout, rpcgen_table_dcl2); } if (Cflag) { diff --git a/usr/src/cmd/saf/extern.h b/usr/src/cmd/saf/extern.h index 0b909fba14..432a4000ad 100644 --- a/usr/src/cmd/saf/extern.h +++ b/usr/src/cmd/saf/extern.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -23,14 +22,14 @@ /* All Rights Reserved */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #ifndef _EXTERN_H #define _EXTERN_H -#pragma ident "%Z%%M% %I% %E% SMI" +#include "structs.h" #ifdef __cplusplus extern "C" { @@ -69,7 +68,7 @@ extern struct sactab *read_entry(); extern struct sactab *findpm(); extern char *trim(); -extern char *pstate(unchar); +extern char *pstate(uchar_t); extern char *nexttok(); extern char **mkargv(); extern char *make_tempname(); diff --git a/usr/src/cmd/saf/structs.h b/usr/src/cmd/saf/structs.h index c06c267bd0..420ab18243 100644 --- a/usr/src/cmd/saf/structs.h +++ b/usr/src/cmd/saf/structs.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,17 +18,20 @@ * * CDDL HEADER END */ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5*/ - - -/* - * REQUIRES: sac.h misc.h - */ +#ifndef _STRUCTS_H +#define _STRUCTS_H +#include <sac.h> +#include "misc.h" /* * error messages @@ -77,17 +79,19 @@ struct sactab { * defn's for sc_sstate, sc_pstate, and sc_lstate */ -# define NOTRUNNING 0 /* PM not running */ -# define STARTING 1 /* PM is starting, must be same as PM_STARTING */ -# define ENABLED 2 /* PM is enabled, must be same as PM_ENABLED */ -# define DISABLED 3 /* PM is disabled, must be same as PM_DISABLED */ -# define STOPPING 4 /* PM is stopping, must be same as PM_STOPPING */ -# define FAILED 5 /* PM has failed */ -# define UNKNOWN 6 /* in recovery, state unknown */ +#define NOTRUNNING 0 /* PM not running */ +#define STARTING 1 /* PM starting, must be same as PM_STARTING */ +#define ENABLED 2 /* PM enabled, must be same as PM_ENABLED */ +#define DISABLED 3 /* PM disabled, must be same as PM_DISABLED */ +#define STOPPING 4 /* PM stopping, must be same as PM_STOPPING */ +#define FAILED 5 /* PM has failed */ +#define UNKNOWN 6 /* in recovery, state unknown */ /* * defn's for sc_flags */ -# define D_FLAG 0x1 -# define X_FLAG 0x2 +#define D_FLAG 0x1 +#define X_FLAG 0x2 + +#endif /* _STRUCTS_H */ diff --git a/usr/src/cmd/sgs/nm/common/nm.c b/usr/src/cmd/sgs/nm/common/nm.c index c3f7197e06..943356e6d4 100644 --- a/usr/src/cmd/sgs/nm/common/nm.c +++ b/usr/src/cmd/sgs/nm/common/nm.c @@ -646,6 +646,14 @@ print_ar_files(int fd, Elf * elf_file, char *filename) } /* end while */ } +static void print_header(int); +#ifndef XPG4 +static void print_with_uflag(SYM *, char *); +#endif +static void print_with_pflag(int, Elf *, unsigned int, SYM *, char *); +static void print_with_Pflag(int, Elf *, unsigned int, SYM *); +static void print_with_otherflags(int, Elf *, unsigned int, + SYM *, char *); /* * Print the symbol table according to the flags that were * set, if any. Input is an opened ELF file, the section name, @@ -670,15 +678,7 @@ print_symtab(Elf *elf_file, unsigned int shstrndx, 8, /* FMT_T_HEX */ 11, /* FMT_T_OCT */ }; - static void print_header(int); int ndigits; -#ifndef XPG4 - static void print_with_uflag(SYM *, char *); -#endif - static void print_with_pflag(int, Elf *, unsigned int, SYM *, char *); - static void print_with_Pflag(int, Elf *, unsigned int, SYM *); - static void print_with_otherflags(int, Elf *, unsigned int, - SYM *, char *); /* * Determine # of digits to use for each numeric value. diff --git a/usr/src/cmd/sgs/size/common/process.c b/usr/src/cmd/sgs/size/common/process.c index 2e4e60b0cd..cae1a6de9a 100644 --- a/usr/src/cmd/sgs/size/common/process.c +++ b/usr/src/cmd/sgs/size/common/process.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,13 +18,16 @@ * * CDDL HEADER END */ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + /* Copyright (c) 1988 AT&T */ /* Copyright (c) 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* UNIX HEADER */ #include <stdio.h> @@ -60,6 +62,7 @@ static const char *format[3] = { "%lld + %lld + %lld = %lld\n" }; +static void process_phdr(Elf *elf, GElf_Half num); void process(Elf * elf) @@ -92,7 +95,6 @@ process(Elf * elf) int notfirst = 0; int i; char *name = 0; - static void process_phdr(Elf *elf, GElf_Half num); /* * If there is a program header and the -f flag requesting section infor- diff --git a/usr/src/cmd/tar/tar.c b/usr/src/cmd/tar/tar.c index 329251c056..0d2f82d20e 100644 --- a/usr/src/cmd/tar/tar.c +++ b/usr/src/cmd/tar/tar.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,8 +34,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <unistd.h> #include <sys/types.h> #include <sys/param.h> @@ -4711,6 +4709,8 @@ response(void) /* Has file been modified since being put into archive? If so, return > 0. */ +static off_t lookup(char *); + static int checkupdate(char *arg) { @@ -4718,7 +4718,6 @@ checkupdate(char *arg) time_t mtime; long nsecs; off_t seekp; - static off_t lookup(char *); rewind(tfile); if ((seekp = lookup(arg)) < 0) diff --git a/usr/src/cmd/ttymon/tmextern.h b/usr/src/cmd/ttymon/tmextern.h index cffc044641..c285b434eb 100644 --- a/usr/src/cmd/ttymon/tmextern.h +++ b/usr/src/cmd/ttymon/tmextern.h @@ -26,9 +26,10 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ +#ifndef _TMEXTERN_H +#define _TMEXTERN_H -#ifndef __TMEXTERN_H -#define __TMEXTERN_H +#include "tmstruct.h" #ifdef __cplusplus extern "C" { @@ -174,4 +175,4 @@ extern "C" { } #endif -#endif /* __TMEXTERN_H */ +#endif /* _TMEXTERN_H */ diff --git a/usr/src/cmd/ttymon/tmstruct.h b/usr/src/cmd/ttymon/tmstruct.h index 1598de05a1..38aea1063e 100644 --- a/usr/src/cmd/ttymon/tmstruct.h +++ b/usr/src/cmd/ttymon/tmstruct.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,17 @@ * * CDDL HEADER END */ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ +#ifndef _TMSTRUCT_H +#define _TMSTRUCT_H /* * /etc/ttydefs structure @@ -76,32 +81,34 @@ struct pmtab { * valid flags for p_flags field of pmtab */ #define X_FLAG 0x1 /* port/service disabled */ -#define U_FLAG 0x2 /* create utmp entry for the service */ +#define U_FLAG 0x2 /* create utmp entry for the service */ /* * valid flags for p_ttyflags field of pmtab */ -#define C_FLAG 0x1 /* invoke service on carrier */ -#define H_FLAG 0x2 /* hangup the line */ -#define B_FLAG 0x4 /* bi-directional line */ -#define R_FLAG 0x8 /* do wait_read */ -#define I_FLAG 0x10 /* initialize only */ +#define C_FLAG 0x1 /* invoke service on carrier */ +#define H_FLAG 0x2 /* hangup the line */ +#define B_FLAG 0x4 /* bi-directional line */ +#define R_FLAG 0x8 /* do wait_read */ +#define I_FLAG 0x10 /* initialize only */ /* * autobaud enabled flag */ -#define A_FLAG 0x20 /* autobaud flag */ +#define A_FLAG 0x20 /* autobaud flag */ /* * values for p_status field of pmtab */ -#define NOTVALID 0 /* entry is not valid */ -#define VALID 1 /* entry is valid */ -#define CHANGED 2 /* entry is valid but changed */ -#define GETTY 3 /* entry is for ttymon express */ +#define NOTVALID 0 /* entry is not valid */ +#define VALID 1 /* entry is valid */ +#define CHANGED 2 /* entry is valid but changed */ +#define GETTY 3 /* entry is for ttymon express */ #define ALLOC_PMTAB \ ((struct pmtab *)calloc((unsigned)1, \ - (unsigned)sizeof(struct pmtab))) + (unsigned)sizeof (struct pmtab))) #define PNULL ((struct pmtab *)NULL) + +#endif /* _TMSTRUCT_H */ diff --git a/usr/src/cmd/ttymon/ttymon.c b/usr/src/cmd/ttymon/ttymon.c index 367776ccd2..b0555612d3 100644 --- a/usr/src/cmd/ttymon/ttymon.c +++ b/usr/src/cmd/ttymon/ttymon.c @@ -265,6 +265,8 @@ initialize() Initialized = TRUE; } +static void free_defs(); + /* * open_all - open devices in pmtab if the entry is * - valid, fd = 0, and pid = 0 @@ -274,7 +276,6 @@ open_all() { struct pmtab *tp; int check_modtime; - static void free_defs(); sigset_t cset; sigset_t tset; diff --git a/usr/src/cmd/vi/port/ex_voper.c b/usr/src/cmd/vi/port/ex_voper.c index 2e229d1c79..825996d0c4 100644 --- a/usr/src/cmd/vi/port/ex_voper.c +++ b/usr/src/cmd/vi/port/ex_voper.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,8 +31,6 @@ * Copyright (c) 1981 Regents of the University of California */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ex.h" #include "ex_tty.h" #include "ex_vis.h" @@ -56,6 +53,8 @@ unsigned char vscandir[2] = { '/', 0 }; +static int get_addr(); + /* * Decode an operator/operand type command. * Eventually we switch to an operator subroutine in ex_vops.c. @@ -84,7 +83,6 @@ operate(int c, int cnt) int mouse_x; int mouse_y; int oline; - static int get_addr(); /* #endif PTR_ADDRESSES */ moveop = vmove, deleteop = (int (*)())vdelete; @@ -228,8 +226,8 @@ nocount: if (i) { if (vlinfo[i - 1].vdepth > 1) { mouse_x += WCOLS * (mouse_y - - (vlinfo[i].vliny - - (vlinfo[i - 1].vdepth - 1))); + (vlinfo[i].vliny - + (vlinfo[i - 1].vdepth - 1))); } } else @@ -745,7 +743,7 @@ errlab: vmoving = 0; wcursor = d == '`' ? ncols[c - 'a'] : 0; if (opf == vmove && (wdot != dot || - (d == '`' && wcursor != cursor))) + (d == '`' && wcursor != cursor))) markDOT(); if (wcursor) { vsave(); diff --git a/usr/src/cmd/vi/port/exrecover.c b/usr/src/cmd/vi/port/exrecover.c index 9bda1ec597..044e1ce2e5 100644 --- a/usr/src/cmd/vi/port/exrecover.c +++ b/usr/src/cmd/vi/port/exrecover.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,8 +29,6 @@ /* Copyright (c) 1981 Regents of the University of California */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> /* BUFSIZ: stdio = 1024, VMUNIX = 1024 */ #ifndef TRACE #undef NULL @@ -832,6 +829,8 @@ rsyserror(void) static int intrupt; +static void catch(); + unsigned char * mypass(prompt) unsigned char *prompt; @@ -842,7 +841,6 @@ unsigned char *prompt; int c; static unsigned char pbuf[9]; void (*sig)(); - static void catch(); setbuf(stdin, (char*)NULL); sig = signal(SIGINT, catch); diff --git a/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c b/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c index ae371678cd..4756ca7971 100644 --- a/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c +++ b/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * NIS update service */ @@ -58,6 +56,7 @@ void ypupdate_prog(); void detachfromtty(); static int addr2netname(char *, SVCXPRT *); +static int issock(); int insecure; extern SVCXPRT *svctcp_create(int, uint_t, uint_t); @@ -69,7 +68,6 @@ main(argc, argv) char *argv[]; { char *cmd; - static int issock(); int connmaxrec = RPC_MAXDATASIZE; struct stat filestat; |