avoid structs in public API where easily possible (this helps people generating bindi...

[r24428]

diff --git a/include/libfirm/firm.h b/include/libfirm/firm.h
index dcf4fa9..da11e91 100644 (file)
--- a/include/libfirm/firm.h
+++ b/include/libfirm/firm.h
@@ -171,25 +171,6 @@ struct _firm_parameter_t {
 
 typedef struct _firm_parameter_t firm_parameter_t;
 
-/* Set a version number if it has not been set in environment */
-#ifndef libfirm_VERSION_MAJOR
-#define libfirm_VERSION_MAJOR 1
-#endif
-
-#ifndef libfirm_VERSION_MINOR
-#define libfirm_VERSION_MINOR 4
-#endif
-
-/**
- * The Firm version number.
- */
-typedef struct _firm_version_t {
-  unsigned major;
-  unsigned minor;
-  const char *revision;
-  const char *build;
-} firm_version_t;
-
 /**
  * Initialize the firm library.
  *
@@ -208,16 +189,14 @@ void init_firm(const firm_parameter_t *params);
  */
 void free_firm(void);
 
-/**
- * Returns the libFirm version number.
- * If statically linked, always libFirm_VERSION_MAJOR, libFirm_VERSION_MINOR
- */
-void firm_get_version(firm_version_t *version);
-
-/**
- * Read initializations arguments from the .init file.
- */
-void firm_init_options(const char *arg_prefix, int argc, const char **argv);
+/** returns the libFirm major version number */
+unsigned firm_get_version_major(void);
+/** returns libFirm minor version number */
+unsigned firm_get_version_minor(void);
+/** returns string describing libFirm revision */
+const char *firm_get_version_revision(void);
+/** returns string describing libFirm build */
+const char *firm_get_version_build(void);
 
 #ifdef __cplusplus
 }

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 27940c4..e1f4904 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -68,11 +68,6 @@ lc_opt_entry_t *firm_opt_get_root(void) {
        return grp;
 }
 
-void firm_init_options(const char *arg_prefix, int argc, const char **argv) {
-       /* parse commandline */
-       lc_opt_from_argv(firm_opt_get_root(), arg_prefix, argc, argv, NULL);
-}
-
 void init_firm(const firm_parameter_t *param)
 {
        firm_parameter_t def_params;
@@ -179,14 +174,26 @@ void free_firm(void) {
        firm_be_finish();
 }
 
-/* Returns the libFirm version number. */
-void firm_get_version(firm_version_t *version) {
-       version->major    = libfirm_VERSION_MAJOR;
-       version->minor    = libfirm_VERSION_MINOR;
+unsigned firm_get_version_major(void)
+{
+       return libfirm_VERSION_MAJOR;
+}
+
+unsigned firm_get_version_minor(void)
+{
+       return libfirm_VERSION_MINOR;
+}
+
+const char *firm_get_version_revision(void)
+{
 #ifdef libfirm_VERSION_REVISION
-       version->revision = libfirm_VERSION_REVISION;
+       return libfirm_VERSION_REVISION;
 #else
-       version->revision = "";
+       return "";
 #endif
-       version->build    = "";
+}
+
+const char *firm_get_version_build(void)
+{
+       return "";
 }