Use C++11 struct initializer

openatv · Sep 23, 2024 · 717ec7c · 717ec7c
1 parent 4c75add
commit 717ec7c
Show file tree

Hide file tree

Showing 43 changed files with 123 additions and 128 deletions.
diff --git a/lib/actions/action.cpp b/lib/actions/action.cpp
@@ -303,8 +303,8 @@ void eActionMap::keyPressed(const std::string &device, int key, int flags)
 						(k->second.m_device == device || k->second.m_device == "generic"))
 					{
 						ePyObject pArgs = PyTuple_New(2);
-						PyTuple_SET_ITEM(pArgs, 0, PyString_FromString(k->first.c_str()));
-						PyTuple_SET_ITEM(pArgs, 1, PyString_FromString(k->second.m_action.c_str()));
+						PyTuple_SET_ITEM(pArgs, 0, PyUnicode_FromString(k->first.c_str()));
+						PyTuple_SET_ITEM(pArgs, 1, PyUnicode_FromString(k->second.m_action.c_str()));
 						Py_INCREF(c->second.m_fnc);
 						call_list.push_back(call_entry(c->second.m_fnc, pArgs));
 					}

diff --git a/lib/base/console.cpp b/lib/base/console.cpp
@@ -75,7 +75,7 @@ eConsoleAppContainer::eConsoleAppContainer():
 
 int eConsoleAppContainer::setCWD( const char *path )
 {
-	struct stat dir_stat;
+	struct stat dir_stat = {};
 
 	if (stat(path, &dir_stat) == -1)
 		return -1;

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
@@ -187,7 +187,7 @@ int eMainloop::processOneEvent(long user_timeout, PyObject **res, ePyObject addi
 		{
 			eTimer *tmr = *it;
 			/* get current time */
-			timespec now;
+			timespec now = {};
 			clock_gettime(CLOCK_MONOTONIC, &now);
 			/* process all timers which are ready. first remove them out of the list. */
 			while (tmr->needsActivation(now))
@@ -223,7 +223,7 @@ int eMainloop::processOneEvent(long user_timeout, PyObject **res, ePyObject addi
 		fdcount += PyDict_Size(additional);
 
 		// build the poll aray
-	pollfd pfd[fdcount];  // make new pollfd array
+	pollfd pfd[fdcount] = {};  // make new pollfd array
 	std::map<int,eSocketNotifier*>::iterator it = notifiers.begin();
 
 	int i=0;
@@ -335,7 +335,7 @@ int eMainloop::iterate(unsigned int twisted_timeout, PyObject **res, ePyObject d
 		int to = -1;
 		if (twisted_timeout)
 		{
-			timespec now, timeout;
+			timespec now = {}, timeout = {};
 			clock_gettime(CLOCK_MONOTONIC, &now);
 			if (m_twisted_timer<=now) // timeout
 				return 0;

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
@@ -46,7 +46,7 @@ static inline timespec &operator+=( timespec &t1, const timespec &t2 )
 
 static inline timespec operator+( const timespec &t1, const timespec &t2 )
 {
-	timespec tmp;
+	timespec tmp = {};
 	tmp.tv_sec = t1.tv_sec + t2.tv_sec;
 	if ( (tmp.tv_nsec = t1.tv_nsec + t2.tv_nsec) >= 1000000000 )
 	{
@@ -58,7 +58,7 @@ static inline timespec operator+( const timespec &t1, const timespec &t2 )
 
 static inline timespec operator-( const timespec &t1, const timespec &t2 )
 {
-	timespec tmp;
+	timespec tmp = {};
 	tmp.tv_sec = t1.tv_sec - t2.tv_sec;
 	if ( (tmp.tv_nsec = t1.tv_nsec - t2.tv_nsec) < 0 )
 	{
@@ -92,7 +92,7 @@ static inline timespec &operator+=( timespec &t1, const long msek )
 
 static inline timespec operator+( const timespec &t1, const long msek )
 {
-	timespec tmp;
+	timespec tmp = {};
 	tmp.tv_sec = t1.tv_sec + msek / 1000;
 	if ( (tmp.tv_nsec = t1.tv_nsec + (msek % 1000) * 1000000) >= 1000000000 )
 	{
@@ -104,7 +104,7 @@ static inline timespec operator+( const timespec &t1, const long msek )
 
 static inline timespec operator-( const timespec &t1, const long msek )
 {
-	timespec tmp;
+	timespec tmp = {};
 	tmp.tv_sec = t1.tv_sec - msek / 1000;
 	if ( (tmp.tv_nsec = t1.tv_nsec - (msek % 1000)*1000000) < 0 )
 	{
@@ -127,7 +127,7 @@ static inline timespec operator-=( timespec &t1, const long msek )
 
 static inline long timeout_usec ( const timespec & orig )
 {
-	timespec now, diff;
+	timespec now = {}, diff = {};
 	clock_gettime(CLOCK_MONOTONIC, &now);
 	diff = orig - now;
 	if (diff.tv_sec > 2000)
@@ -194,7 +194,7 @@ class eMainloop
 	int retval;
 	eSocketNotifier *m_inActivate;
 	int m_interrupt_requested;
-	timespec m_twisted_timer;
+	timespec m_twisted_timer = {};
 
 	/* user_timeout < 0 - forever
 	 * user_timeout = 0 - immediately
@@ -279,7 +279,7 @@ class eTimer: iObject
 	friend class eMainloop;
 
 	eMainloop &context;
-	timespec nextActivation;
+	timespec nextActivation = {};
 	long interval;
 	bool bSingleShot;
 	bool bActive;

diff --git a/lib/base/eerror.cpp b/lib/base/eerror.cpp
@@ -143,8 +143,8 @@ int formatTime(char *buf, int bufferSize, int flags)
 	{
 		if (debugTime & 6)
 		{
-			struct tm loctime;
-			struct timeval tim;
+			struct tm loctime = {};
+			struct timeval tim = {};
 			gettimeofday(&tim, NULL);
 			localtime_r(&tim.tv_sec, &loctime);
 			if (debugTime & 4)
@@ -159,7 +159,7 @@ int formatTime(char *buf, int bufferSize, int flags)
 		}
 		if (debugTime & 1)
 		{
-			struct timespec tp;
+			struct timespec tp = {};
 			clock_gettime(CLOCK_MONOTONIC, &tp);
 			// Cast to (long long) is to cater for older 32-bit time fields
 			pos += snprintf(buf + pos, bufferSize - pos, "<%6lld.%06lld> ", (long long)tp.tv_sec, (long long)tp.tv_nsec / 1000);

diff --git a/lib/base/esimpleconfig.cpp b/lib/base/esimpleconfig.cpp
@@ -20,7 +20,7 @@ namespace eSimpleConfig
 	{
 		std::string file = eEnv::resolve("${sysconfdir}/enigma2/settings");
 
-		struct stat settings_stat;
+		struct stat settings_stat = {};
 		if (stat(file.c_str(), &settings_stat) == -1 || settings_stat.st_mtime <= lastModified)
 			return;
 

diff --git a/lib/base/etpm.cpp b/lib/base/etpm.cpp
@@ -14,7 +14,7 @@
 
 eTPM::eTPM()
 {
-	struct sockaddr_un addr;
+	struct sockaddr_un addr = {};
 	unsigned char buf[8];
 	unsigned int tag;
 	size_t len;

diff --git a/lib/base/internetcheck.cpp b/lib/base/internetcheck.cpp
@@ -59,7 +59,7 @@ int checkLinkStatus()
 	}
 
 	int sock;
-	struct ifreq ifr;
+	struct ifreq ifr = {};
 	// Create a socket
 	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0)

diff --git a/lib/base/rawfile.cpp b/lib/base/rawfile.cpp
@@ -162,7 +162,7 @@ off_t eRawFile::length()
 	}
 	else
 	{
-		struct stat st;
+		struct stat st = {};
 		if (::fstat(m_fd, &st) < 0)
 			return -1;
 		return st.st_size;

diff --git a/lib/base/thread.cpp b/lib/base/thread.cpp
@@ -55,7 +55,7 @@ int eThread::runAsync(int prio, int policy)
 
 	if (prio || policy)
 	{
-		struct sched_param p;
+		struct sched_param p = {};
 		p.__sched_priority=prio;
 		pthread_attr_setschedpolicy(&attr, policy);
 		pthread_attr_setschedparam(&attr, &p);

diff --git a/lib/base/wrappers.cpp b/lib/base/wrappers.cpp
@@ -18,7 +18,7 @@ int Select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, stru
 {
 	int retval;
 	fd_set rset, wset, xset;
-	timeval interval;
+	timeval interval = {};
 
 	/* make a backup of all fd_set's and timeval struct */
 	if (readfds) rset = *readfds;
@@ -64,7 +64,7 @@ ssize_t singleRead(int fd, void *buf, size_t count)
 		if (retval < 0)
 		{
 			if (errno == EINTR) continue;
-			eDebug("[singleRead] error: %m");
+			eDebug("[singleRead] error: %d (%m)", errno);
 		}
 		return retval;
 	}
@@ -73,7 +73,7 @@ ssize_t singleRead(int fd, void *buf, size_t count)
 ssize_t timedRead(int fd, void *buf, size_t count, int initialtimeout, int interbytetimeout)
 {
 	fd_set rset;
-	struct timeval timeout;
+	struct timeval timeout = {};
 	int result;
 	size_t totalread = 0;
 
@@ -132,7 +132,7 @@ int Connect(const char *hostname, int port, int timeoutsec)
 	int sd = -1;
 	std::vector<struct addrinfo *> addresses;
 	struct addrinfo *info = NULL;
-	struct addrinfo hints;
+	struct addrinfo hints = {};
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = AF_UNSPEC; /* both ipv4 and ipv6 */
 	hints.ai_socktype = SOCK_STREAM;
@@ -188,7 +188,7 @@ int Connect(const char *hostname, int port, int timeoutsec)
 				{
 					int error;
 					socklen_t len = sizeof(error);
-					timeval timeout;
+					timeval timeout = {};
 					fd_set wset;
 					FD_ZERO(&wset);
 					FD_SET(sd, &wset);

diff --git a/lib/components/file_eraser.cpp b/lib/components/file_eraser.cpp
@@ -95,7 +95,7 @@ void eBackgroundFileEraser::gotMessage(const Message &msg )
 		if ((((erase_flags & ERASE_FLAG_HDD) != 0) && (strncmp(c_filename, "/media/hdd/", 11) == 0)) ||
 		    ((erase_flags & ERASE_FLAG_OTHER) != 0))
 		{
-			struct stat st;
+			struct stat st = {}
 			int i = ::stat(c_filename, &st);
 			// truncate only if the file exists and does not have any hard links
 			if ((i == 0) && (st.st_nlink == 1))

diff --git a/lib/driver/avcontrol.cpp b/lib/driver/avcontrol.cpp
@@ -75,7 +75,7 @@ eAVControl *eAVControl::m_instance = nullptr;
 
 eAVControl::eAVControl()
 {
-	struct stat buffer;
+	struct stat buffer = {};
 
 #ifdef HAVE_HDMIIN_DM
 	m_b_has_proc_hdmi_rx_monitor = (stat(proc_hdmi_rx_monitor, &buffer) == 0);

diff --git a/lib/driver/hdmi_cec.cpp b/lib/driver/hdmi_cec.cpp
@@ -176,7 +176,7 @@ eHdmiCEC *eHdmiCEC::getInstance()
 
 void eHdmiCEC::reportPhysicalAddress()
 {
-	struct cec_message txmessage;
+	struct cec_message txmessage = {};
 	memset(&txmessage, 0, sizeof(txmessage));
 	txmessage.address = 0x0f; /* broadcast */
 	txmessage.data[0] = 0x84; /* report address */
@@ -192,7 +192,7 @@ void eHdmiCEC::getAddressInfo()
 	if (hdmiFd >= 0)
 	{
 		bool hasdata = false;
-		struct addressinfo addressinfo;
+		struct addressinfo addressinfo = {};
 
 		if (linuxCEC)
 		{
@@ -330,7 +330,7 @@ void eHdmiCEC::hdmiEvent(int what)
 	{
 		if (linuxCEC)
 		{
-			struct cec_event cecevent;
+			struct cec_event cecevent = {};
 			::ioctl(hdmiFd, CEC_DQEVENT, &cecevent);
 			if (cecevent.event == CEC_EVENT_STATE_CHANGE)
 			{
@@ -343,10 +343,10 @@ void eHdmiCEC::hdmiEvent(int what)
 	if (what & eSocketNotifier::Read)
 	{
 		bool hasdata = false;
-		struct cec_rx_message rxmessage;
+		struct cec_rx_message rxmessage = {};
 		if (linuxCEC)
 		{
-			struct cec_msg msg;
+			struct cec_msg msg = {};
 			if (::ioctl(hdmiFd, CEC_RECEIVE, &msg) >= 0)
 			{
 				rxmessage.length = msg.len - 1;
@@ -565,7 +565,7 @@ void eHdmiCEC::sendMessage(struct cec_message &message)
 
 void eHdmiCEC::sendMessage(unsigned char address, unsigned char cmd, char *data, int length)
 {
-	struct cec_message message;
+	struct cec_message message = {};
 	message.address = address;
 	if (length > (int)(sizeof(message.data) - 1)) length = sizeof(message.data) - 1;
 	message.length = length + 1;

diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp
@@ -96,7 +96,7 @@ eRCShortDriver::~eRCShortDriver()
 
 void eRCInputEventDriver::keyPressed(int)
 {
-	struct input_event ev;
+	struct input_event ev = {};
 	while (1)
 	{
 		if (read(handle, &ev, sizeof(struct input_event))!=sizeof(struct input_event))

diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
@@ -21,7 +21,7 @@ eRCConsoleDriver::eRCConsoleDriver(const char *filename): eRCDriver(eRCInput::ge
 	if (handle >= 0)
 	{
 			/* set console mode */
-		struct termios t;
+		struct termios t = {};
 		tcgetattr(handle, &t);
 		ot = t;
 		t.c_lflag &= ~(ECHO | ICANON | ECHOK | ECHOE | ECHONL);

diff --git a/lib/driver/rcdreambox2.cpp b/lib/driver/rcdreambox2.cpp
@@ -215,7 +215,7 @@ class eRCDeviceDreambox2Init
 	eRCDeviceDreambox2Init()
 	 : m_driver(NULL), m_device(NULL), m_buttondriver(NULL), m_buttondevice(NULL)
 	{
-		struct stat s;
+		struct stat s = {};
 		if (::access("/dev/rawir2", R_OK) >= 0)
 		{
 			m_driver = new eRCShortDriver("/dev/rawir2");

diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
@@ -77,7 +77,7 @@ void eRCDeviceInputDev::handleCode(long rccode)
 			{
 				if (consoleFd >= 0)
 				{
-					struct kbentry ke;
+					struct kbentry ke = {};
 					/* off course caps is not the same as shift, but this will have to do for now */
 					ke.kb_table = (shiftState || capsState) ? K_SHIFTTAB : K_NORMTAB;
 					ke.kb_index = ev->code;