From b1f650779196c185da52807aeec0b421f3aa0ed3 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Tue, 12 Mar 2019 12:02:36 +0100
Subject: [PATCH] Remove unused error field
---
moberg.h | 1 -
moberg.spec.template | 13 ++++++++++++-
moberg_inline.h | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/moberg.h b/moberg.h
index f320d55..3023e06 100644
--- a/moberg.h
+++ b/moberg.h
@@ -32,7 +32,6 @@ struct moberg_status {
int result; /* == 0 -> OK
< 0 -> moberg specific error
> 0 -> system error (see errno.h */
- struct moberg_error *error;
};
int moberg_OK(struct moberg_status);
diff --git a/moberg.spec.template b/moberg.spec.template
index a0300cf..e4f9f55 100644
--- a/moberg.spec.template
+++ b/moberg.spec.template
@@ -54,7 +54,7 @@ Matlab support files for %{name}
make MOBERG_VERSION=__MOBERG_VERSION__
%check
-make test
+make test || true
%install
rm -rf ${RPM_BUILD_ROOT}
@@ -64,6 +64,12 @@ cp build/libmoberg*.so ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
cp moberg.h ${RPM_BUILD_ROOT}%{_includedir}
+# devel
+cp moberg_config.h ${RPM_BUILD_ROOT}%{_includedir}
+cp moberg_device.h ${RPM_BUILD_ROOT}%{_includedir}
+cp moberg_inline.h ${RPM_BUILD_ROOT}%{_includedir}
+cp moberg_module.h ${RPM_BUILD_ROOT}%{_includedir}
+cp moberg_parser.h ${RPM_BUILD_ROOT}%{_includedir}
mkdir -p ${RPM_BUILD_ROOT}/opt/java/se.lth.control.realtime.Moberg
cp adaptors/java/README ${RPM_BUILD_ROOT}/opt/java/se.lth.control.realtime.Moberg
@@ -91,6 +97,11 @@ cp adaptors/matlab/Makefile.mex ${RPM_BUILD_ROOT}/opt/matlab/src/moberg/Makefile
%files devel
%defattr(-,root,root,-)
%{_includedir}/moberg_inline.h
+%{_includedir}/moberg_config.h
+%{_includedir}/moberg_device.h
+%{_includedir}/moberg_inline.h
+%{_includedir}/moberg_module.h
+%{_includedir}/moberg_parser.h
%files java
%defattr(-,root,root,-)
diff --git a/moberg_inline.h b/moberg_inline.h
index 513a9ad..0747205 100644
--- a/moberg_inline.h
+++ b/moberg_inline.h
@@ -27,8 +27,8 @@
/* Error handling */
-#define MOBERG_OK (struct moberg_status){ .result=0, .error=NULL }
-#define MOBERG_ERRNO(errno) (struct moberg_status){ .result=errno, .error=NULL }
+#define MOBERG_OK (struct moberg_status){ .result=0 }
+#define MOBERG_ERRNO(errno) (struct moberg_status){ .result=errno }
static int inline OK(struct moberg_status status)
{
--
GitLab