From owner-p4-projects@FreeBSD.ORG  Sun Jul 10 20:31:21 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B58F16A420; Sun, 10 Jul 2005 20:31:21 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 20BDD16A41C
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 20:31:21 +0000 (GMT)
	(envelope-from soc-victor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DECC743D58
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 20:31:20 +0000 (GMT)
	(envelope-from soc-victor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AKVKcI025655
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 20:31:20 GMT
	(envelope-from soc-victor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AKVKT3025652
	for perforce@freebsd.org; Sun, 10 Jul 2005 20:31:20 GMT
	(envelope-from soc-victor@freebsd.org)
Date: Sun, 10 Jul 2005 20:31:20 GMT
Message-Id: <200507102031.j6AKVKT3025652@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-victor@freebsd.org using -f
From: soc-victor <soc-victor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79936 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jul 2005 20:31:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=79936

Change 79936 by soc-victor@soc-victor_82.76.158.176 on 2005/07/10 20:30:56

	Cosmetic changes in the gensnmptree tool so as the <prefix>_tree.h 
	generated/ output file to contain the #ifndef...#define... #endif 
	clauses in order to prevent multiple inclusions.

Affected files ...

.. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#2 edit

Differences ...

==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#2 (text+ko) ====

@@ -898,6 +898,8 @@
 	int opt;
 	struct node *root;
 	char fname[MAXPATHLEN + 1];
+	char include_fname[MAXPATHLEN + 128 +1];
+	int idx;
 	int tok;
 
 	while ((opt = getopt(argc, argv, "help:t")) != EOF)
@@ -955,13 +957,24 @@
 		return (0);
 	}
 	sprintf(fname, "%stree.h", file_prefix);
+	
+	/*prepare the ifndef directive*/
+	memset(include_fname,'\0',sizeof(include_fname));
+	snprintf(include_fname, MAXPATHLEN + 128, "_%sTREE_H_INCLUDED__",file_prefix);
+	for(idx = 0; idx < strlen(include_fname); idx++){
+		include_fname[idx] = toupper(include_fname[idx]);		
+	}
+			
 	if ((fp = fopen(fname, "w")) == NULL)
 		err(1, "%s: ", fname);
+	
+	fprintf(fp, "#ifndef %s\n",include_fname);
+	fprintf(fp, "#define %s\n",include_fname);		
 	gen_header(root, PREFIX_LEN, NULL);
 
 	fprintf(fp, "#define %sCTREE_SIZE %u\n", file_prefix, tree_size);
 	fprintf(fp, "extern const struct snmp_node %sctree[];\n", file_prefix);
-
+	fprintf(fp, "#endif /* %s */\n",include_fname);
 	fclose(fp);
 
 	sprintf(fname, "%stree.c", file_prefix);