Skip to content
Snippets Groups Projects
Commit 5700e93a authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Adding missing return statments and types to let things build on gcc 8.

Missing return values and return types keep daq from building on debian 10.
parent 07ef60e9
No related branches found
No related tags found
No related merge requests found
......@@ -109,6 +109,7 @@ public:
signal_slope = a.signal_slope;
signal_offset = a.signal_offset;
strcpy(signal_units, a.signal_units);
return *this;
}
};
......
......@@ -1827,6 +1827,7 @@ bool daqd_c::symm_ok() { return 1; }
#endif
#endif
/// Server main function.
int
main (int argc, char *argv [])
{
int farg;
......@@ -1992,6 +1993,7 @@ main (int argc, char *argv [])
main_exit_status = 0;
pthread_exit (&main_exit_status);
return 0;
}
/// Shutdown the daqd server, exit.
......
......@@ -79,6 +79,7 @@ edcu::edcu_main ()
(void *)&(daqd.edcu1.channel_value[i]), 0);
}
system_log(1, "EDCU has %d channels configured; first=%d\n", num_chans, fidx);
return (void*)0;
}
#endif /* if EPICS_EDCU != 1 */
......@@ -25,5 +25,6 @@ epicsServer::epics_main ()
pCAS->setDebugLevel(0);
system_log(1, "Epics server started");
for(;!server_is_shutting_down;) fileDescriptorManager.process(1000.0);
return (void*)0;
}
......@@ -40,7 +40,7 @@ public:
static void *frame_writer_crc_static (void *a) { return ((producer *)a) -> frame_writer_crc();}
void *grabIfoData (int, int, unsigned char *);
void grabIfoDataThread (void);
static void *grabIfoData_static(void *a) { ((producer *)a) -> grabIfoDataThread();};
static void *grabIfoData_static(void *a) { ((producer *)a) -> grabIfoDataThread(); return (void*)0; };
pthread_t tid;
pthread_t tid1; ///< Parallel producer thread
......
......@@ -121,8 +121,8 @@ parseConfigFile(char *fname, unsigned long *crc,
int (*callback)(char *channel_name, struct CHAN_PARAM *params, void *user),
int testpoint, char *arch_file, void *user)
{
unsigned long crc_ptr(char* cp, unsigned int bytes, unsigned int crc);
unsigned long crc_len(unsigned int bytes, unsigned int crc);
unsigned int crc_ptr(char* cp, unsigned int bytes, unsigned int crc);
unsigned long crc_int(unsigned int bytes, unsigned int crc);
CHAN_PARAM deflt;
CHAN_PARAM current;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment