X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cgi-bin%2Fhelp-index.h;h=c486fba05a1c62ca498ac5b9466ecf1d62554ee9;hb=998a43a0ddc6fa4675e31c5d7fb61736e6a78125;hp=fd587b0e4c0a1248972e14c1a180c274265f6b1b;hpb=7a6a01ddca9307aa0f0abe27bb0f9074b86b1093;p=thirdparty%2Fcups.git

diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index fd587b0e4..c486fba05 100644
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -1,25 +1,10 @@
 /*
- * "$Id$"
+ * Online help index definitions for CUPS.
  *
- *   On-line help index definitions for the Common UNIX Printing System (CUPS).
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 #ifndef _CUPS_HELP_INDEX_H_
@@ -32,23 +17,38 @@
 #  include <cups/array.h>
 
 
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
 /*
  * Data structures...
  */
 
-typedef struct				/**** Help node structure... ****/
+typedef struct help_word_s		/**** Help word structure... ****/
+{
+  int		count;			/* Number of occurrences */
+  char		*text;			/* Word text */
+} help_word_t;
+
+typedef struct help_node_s		/**** Help node structure... ****/
 {
   char		*filename;		/* Filename, relative to help dir */
   char		*section;		/* Section name (NULL if none) */
   char		*anchor;		/* Anchor name (NULL if none) */
   char		*text;			/* Text in anchor */
+  cups_array_t	*words;			/* Words after this node */
   time_t	mtime;			/* Last modification time */
   off_t		offset;			/* Offset in file */
   size_t	length;			/* Length in bytes */
   int		score;			/* Search score */
 } help_node_t;
 
-typedef struct				/**** Help index structure ****/
+typedef struct help_index_s		/**** Help index structure ****/
 {
   int		search;			/* 1 = search index, 0 = normal */
   cups_array_t	*nodes;			/* Nodes sorted by filename */
@@ -70,8 +70,8 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 					 const char *filename);
 
 
-#endif /* !_CUPS_HELP_INDEX_H_ */
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
 
-/*
- * End of "$Id$".
- */
+#endif /* !_CUPS_HELP_INDEX_H_ */