aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-15 21:19:38 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-15 21:24:15 -0300
commit9eaa2327da63fffd0dcaaa02b7641e66f881e20d (patch)
treea53f9123a2e8254ec47b3288c3e66362cf2e074a
parent6cf771ee9d03ae89a470f75e19729df6f480bc10 (diff)
libdvbv5: revert an ABI breakage
While changeset a2c7b05cf8d7 kept the same API, it broke ABI, as a binary-compiled utility would complain about some missing symbols: +#MISSING: 1.4.0+r2502-63~ubuntu14.10.1# dvb_fe_open2@Base 1.4.0 +#MISSING: 1.4.0+r2502-63~ubuntu14.10.1# dvb_fe_open@Base 1.4.0 So, return the inline functions back to the library. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--lib/include/libdvbv5/dvb-fe.h17
-rw-r--r--lib/libdvbv5/dvb-fe.c17
2 files changed, 21 insertions, 13 deletions
diff --git a/lib/include/libdvbv5/dvb-fe.h b/lib/include/libdvbv5/dvb-fe.h
index 136dc7c1..ba4c2dc6 100644
--- a/lib/include/libdvbv5/dvb-fe.h
+++ b/lib/include/libdvbv5/dvb-fe.h
@@ -215,14 +215,9 @@ struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int frontend,
*
* @return Returns a pointer to an allocated data pointer or NULL on error.
*/
-static inline struct dvb_v5_fe_parms *dvb_fe_open(int adapter, int frontend,
+struct dvb_v5_fe_parms *dvb_fe_open(int adapter, int frontend,
unsigned verbose,
- unsigned use_legacy_call)
-{
- return dvb_fe_open_flags(adapter, frontend, verbose, use_legacy_call,
- NULL, O_RDWR);
-
-};
+ unsigned use_legacy_call);
/**
* @brief Opens a frontend and allocates a structure to work with
@@ -244,13 +239,9 @@ static inline struct dvb_v5_fe_parms *dvb_fe_open(int adapter, int frontend,
*
* @return Returns a pointer to an allocated data pointer or NULL on error.
*/
-static inline struct dvb_v5_fe_parms *dvb_fe_open2(int adapter, int frontend,
+struct dvb_v5_fe_parms *dvb_fe_open2(int adapter, int frontend,
unsigned verbose, unsigned use_legacy_call,
- dvb_logfunc logfunc)
-{
- return dvb_fe_open_flags(adapter, frontend, verbose, use_legacy_call,
- logfunc, O_RDWR);
-}
+ dvb_logfunc logfunc);
/**
* @brief Closes the frontend and frees allocated resources
diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c
index fb76787c..f535311b 100644
--- a/lib/libdvbv5/dvb-fe.c
+++ b/lib/libdvbv5/dvb-fe.c
@@ -49,6 +49,23 @@ struct dvb_v5_fe_parms *dvb_fe_dummy()
return &parms->p;
}
+struct dvb_v5_fe_parms *dvb_fe_open(int adapter, int frontend,
+ unsigned verbose,
+ unsigned use_legacy_call)
+{
+ return dvb_fe_open_flags(adapter, frontend, verbose, use_legacy_call,
+ NULL, O_RDWR);
+
+}
+
+struct dvb_v5_fe_parms *dvb_fe_open2(int adapter, int frontend,
+ unsigned verbose, unsigned use_legacy_call,
+ dvb_logfunc logfunc)
+{
+ return dvb_fe_open_flags(adapter, frontend, verbose, use_legacy_call,
+ logfunc, O_RDWR);
+}
+
struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int frontend,
unsigned verbose,
unsigned use_legacy_call,

Privacy Policy