mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

address MacOS CI failures

This commit is contained in:
Jim Melton 2022-07-29 16:10:07 -06:00
parent d449d93885
commit 963b1cc63c
No known key found for this signature in database
GPG Key ID: C46392D9AACAB216
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/libs/rtklib/rtklib.h
View File

@ -1108,7 +1108,7 @@ typedef struct
} serial_t;
typedef struct
struct file_t
{ /* file control type */
FILE *fp = nullptr; /* file pointer */
FILE *fp_tag = nullptr; /* file pointer of tag file */
@ -1129,7 +1129,7 @@ typedef struct
double speed = 0; /* replay speed (time factor) */
double swapintv = 0; /* swap interval (hr) (0: no swap) */
lock_t lock; /* lock flag */
} file_t;
};
typedef struct

7
src/algorithms/libs/rtklib/rtklib_stream.cc
View File

@ -44,6 +44,7 @@
#include <netdb.h>
#include <netinet/tcp.h>
#include <regex>
#include <sstream>
#include <string>
#include <sys/socket.h>
#include <sys/stat.h>
@ -235,7 +236,7 @@ int openfile_(file_t *file, gtime_t time, char *msg)
char tagpath[MAXSTRPATH + 4] = "";
char tagh[TIMETAGH_LEN + 1] = "";
tracet(3, "openfile_: path=%s time=%s\n", file->path, time_str(time, 0));
tracet(3, "openfile_: path=%s time=%s\n", file->path.data(), time_str(time, 0));
file->time = utc2gpst(timeget());
file->tick = file->tick_f = tickget();
@ -331,7 +332,7 @@ int openfile_(file_t *file, gtime_t time, char *msg)
/* close file ----------------------------------------------------------------*/
void closefile_(file_t *file)
{
tracet(3, "closefile_: path=%s\n", file->path);
tracet(3, "closefile_: path=%s\n", file->path.data());
if (file->fp)
{
fclose(file->fp);
@ -358,7 +359,7 @@ void closefile_(file_t *file)
/* open file (path=filepath[::T[::+<off>][::x<speed>]][::S=swapintv]) --------*/
file_t *openfile(std::string const &path, int mode, char *msg)
{
tracet(3, "openfile: path=%s mode=%d\n", path, mode);
tracet(3, "openfile: path=%s mode=%d\n", path.data(), mode);
if ((mode & (STR_MODE_R | STR_MODE_W)) == 0)
{