Synced to the latest from upstream, with a light modification required for the

module.


git-svn-id: svn://svn.autonomy.net.au/python-dmidecode@73 abc39116-655e-4be6-ad55-d661dc543056

1 files changed, 14 insertions, 14 deletions

diff --git a/dmiopt.h b/dmiopt.h
index 667ff9a..63af792 100644
--- a/dmiopt.h
+++ b/dmiopt.h
@@ -2,7 +2,7 @@
  * Command line handling of dmidecode
  * This file is part of the dmidecode project.
  *
- *   (C) 2005 Jean Delvare <khali@linux-fr.org>
+ *   Copyright (C) 2005-2008 Jean Delvare <khali@linux-fr.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -19,29 +19,29 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <Python.h>
-
-struct string_keyword {
-  const char *keyword;
-  u8 type;
-  u8 offset;
-  const char *(*lookup)(u8);
-  const char *(*print)(u8 *, char *);
+struct string_keyword
+{
+	const char *keyword;
+	u8 type;
+	u8 offset;
 };
 
 struct opt
 {
-	const char* devmem;
+	const char *devmem;
 	unsigned int flags;
 	u8 *type;
 	const struct string_keyword *string;
+	char *dumpfile;
 };
 extern struct opt opt;
 
-#define FLAG_VERSION            (1<<0)
-#define FLAG_HELP               (1<<1)
-#define FLAG_DUMP               (1<<2)
-#define FLAG_QUIET              (1<<3)
+#define FLAG_VERSION            (1 << 0)
+#define FLAG_HELP               (1 << 1)
+#define FLAG_DUMP               (1 << 2)
+#define FLAG_QUIET              (1 << 3)
+#define FLAG_DUMP_BIN           (1 << 4)
+#define FLAG_FROM_DUMP          (1 << 5)
 
 int parse_command_line(int argc, char * const argv[]);
 void print_help(void);