Commit 51c009eb authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

clang-format on pstream files

parent 5868e763
......@@ -203,10 +203,7 @@ pstream_init_entry(pstream_t *pstreamptr)
// pstreamptr->wthreadID = 0;
#endif
}
pstream_t::pstream_t()
{
pstream_init_entry(this);
}
pstream_t::pstream_t() { pstream_init_entry(this); }
static void
pstream_delete_entry(pstream_t *pstreamptr)
......@@ -215,7 +212,7 @@ pstream_delete_entry(pstream_t *pstreamptr)
PSTREAM_LOCK();
delete(pstreamptr);
delete (pstreamptr);
_pstreamList[idx].next = _pstreamAvail;
_pstreamList[idx].ptr = 0;
......@@ -667,14 +664,14 @@ pstreamOpenWritePipe(const argument_t *argument, int filetype)
#if defined(HAVE_LIBPTHREAD)
if (PSTREAM_Debug)
{
{
Message("pipe %s", argument->args);
}
}
pstreamID = pstreamFindID(argument->args);
if (pstreamID == -1)
{
Error("%s is not open!", argument->args);
}
{
Error("%s is not open!", argument->args);
}
pstream_t *pstreamptr = pstream_to_pointer(pstreamID);
......@@ -823,10 +820,10 @@ pstreamOpenAppend(const argument_t *argument)
if (ispipe)
{
if (PSTREAM_Debug)
{
Message("pipe %s", argument->args);
cdoAbort("this operator doesn't work with pipes!");
}
{
Message("pipe %s", argument->args);
cdoAbort("this operator doesn't work with pipes!");
}
}
else
{
......@@ -1021,7 +1018,9 @@ pstreamInqVlist(int pstreamID)
return pstreamptr->inqVlist();
}
int pstream_t::inqVlist(){
int
pstream_t::inqVlist()
{
int vlistID = -1;
#if defined(HAVE_LIBPTHREAD)
......@@ -1635,7 +1634,8 @@ pstreamDefTimestep(int pstreamID, int tsID)
pstreamptr->defTimestep(tsID);
}
void pstream_t::defTimestep(int p_tsID)
void
pstream_t::defTimestep(int p_tsID)
{
#if defined(HAVE_LIBPTHREAD)
if (ispipe)
......
......@@ -23,59 +23,59 @@
#include <sys/types.h> /* off_t */
class pstream_t {
public:
pstream_t();
class pstream_t
{
public:
pstream_t();
int inqVlist();
void defTimestep(int p_tsID);
bool isPipe();
//void pstreamOpenReadPipe(const argument_t *argument);
//void pstreamOpenReadFile(const argument_t *argument);
int self;
int mode;
int fileID;
int m_vlistID;
int tsID;
int m_filetype;
int tsID0;
int mfiles;
int nfiles;
int varID; /* next varID defined with streamDefVar */
bool ispipe;
bool isopen;
char *name;
char **mfnames;
varlist_t *m_varlist;
// void pstreamOpenReadPipe(const argument_t *argument);
// void pstreamOpenReadFile(const argument_t *argument);
int self;
int mode;
int fileID;
int m_vlistID;
int tsID;
int m_filetype;
int tsID0;
int mfiles;
int nfiles;
int varID; /* next varID defined with streamDefVar */
bool ispipe;
bool isopen;
char *name;
char **mfnames;
varlist_t *m_varlist;
#if defined(HAVE_LIBPTHREAD)
void *argument;
void *argument;
struct pipe_t *pipe;
pthread_t rthreadID; /* read thread ID */
pthread_t wthreadID; /* write thread ID */
pthread_t rthreadID; /* read thread ID */
pthread_t wthreadID; /* write thread ID */
#endif
};
int pstreamOpenRead(const argument_t *argument);
int pstreamOpenAppend(const argument_t *argument);
void pstreamClose(int pstreamID);
int pstreamOpenRead(const argument_t *argument);
int pstreamOpenAppend(const argument_t *argument);
void pstreamClose(int pstreamID);
int pstreamInqFiletype(int pstreamID);
int pstreamInqByteorder(int pstreamID);
int pstreamInqFiletype(int pstreamID);
int pstreamInqByteorder(int pstreamID);
int pstreamInqVlist(int pstreamID);
int pstreamInqVlist(int pstreamID);
int pstreamInqTimestep(int pstreamID, int tsID);
int pstreamInqTimestep(int pstreamID, int tsID);
int pstreamInqRecord(int pstreamID, int *varID, int *levelID);
int pstreamInqRecord(int pstreamID, int *varID, int *levelID);
void pstreamReadRecord(int pstreamID, double *data, int *nmiss);
void pstreamReadRecordF(int pstreamID, float *data, int *nmiss);
void pstreamCopyRecord(int pstreamIDdest, int pstreamIDsrc);
void pstreamReadRecord(int pstreamID, double *data, int *nmiss);
void pstreamReadRecordF(int pstreamID, float *data, int *nmiss);
void pstreamCopyRecord(int pstreamIDdest, int pstreamIDsrc);
void pstreamInqGRIBinfo(int pstreamID, int *intnum, float *fltnum, off_t *bignum);
void pstreamInqGRIBinfo(int pstreamID, int *intnum, float *fltnum, off_t *bignum);
int pstreamFileID(int pstreamID);
int pstreamFileID(int pstreamID);
void cdoVlistCopyFlag(int vlistID2, int vlistID1);
void cdoVlistCopyFlag(int vlistID2, int vlistID1);
#endif /* PSTREAM_H */
#endif /* PSTREAM_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment