* Sebastian Hammer, Adam Dickmeiss
*
* $Log: retrieve.c,v $
- * Revision 1.7 1999-03-02 16:15:43 quinn
+ * Revision 1.10 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.9 1999/05/20 12:57:18 adam
+ * Implemented TCL filter. Updated recctrl system.
+ *
+ * Revision 1.8 1999/03/09 16:27:49 adam
+ * More work on SDRKit integration.
+ *
+ * Revision 1.7 1999/03/02 16:15:43 quinn
* Added "tagsysno" and "tagrank" directives to zebra.cfg.
*
* Revision 1.6 1999/02/18 15:01:25 adam
static int record_ext_read (void *fh, char *buf, size_t count)
{
- struct fetch_control *fc = fh;
+ struct fetch_control *fc = (struct fetch_control *) fh;
return read (fc->fd, buf, count);
}
static off_t record_ext_seek (void *fh, off_t offset)
{
- struct fetch_control *fc = fh;
+ struct fetch_control *fc = (struct fetch_control *) fh;
return lseek (fc->fd, offset + fc->record_offset, SEEK_SET);
}
static off_t record_ext_tell (void *fh)
{
- struct fetch_control *fc = fh;
+ struct fetch_control *fc = (struct fetch_control *) fh;
return lseek (fc->fd, 0, SEEK_CUR) - fc->record_offset;
}
static off_t record_int_seek (void *fh, off_t offset)
{
- struct fetch_control *fc = fh;
+ struct fetch_control *fc = (struct fetch_control *) fh;
return (off_t) (fc->record_int_pos = offset);
}
static off_t record_int_tell (void *fh)
{
- struct fetch_control *fc = fh;
+ struct fetch_control *fc = (struct fetch_control *) fh;
return (off_t) fc->record_int_pos;
}
static int record_int_read (void *fh, char *buf, size_t count)
{
- struct fetch_control *fc = fh;
+ struct fetch_control *fc = (struct fetch_control *) fh;
int l = fc->record_int_len - fc->record_int_pos;
if (l <= 0)
return 0;
char subType[128];
struct fetch_control fc;
RecordAttr *recordAttr;
+ void *clientData;
rec = rec_get (zh->records, sysno);
if (!rec)
file_type = rec->info[recInfo_fileType];
fname = rec->info[recInfo_filename];
basename = rec->info[recInfo_databaseName];
- *basenamep = odr_malloc (stream, strlen(basename)+1);
+ *basenamep = (char *) odr_malloc (stream, strlen(basename)+1);
strcpy (*basenamep, basename);
- if (!(rt = recType_byName (zh->recTypes, file_type, subType)))
+ if (!(rt = recType_byName (zh->recTypes, file_type, subType, &clientData)))
{
logf (LOG_WARN, "Retrieve: Cannot handle type %s", file_type);
return 14;
recordAttr->recordOffset);
if (fc.record_int_len > 180)
{
- logf (LOG_LOG, "%0.70s", fc.record_int_buf);
- logf (LOG_LOG, "%0.70s", fc.record_int_buf +
+ logf (LOG_LOG, "%.70s", fc.record_int_buf);
+ logf (LOG_LOG, "%.70s", fc.record_int_buf +
(fc.record_int_len - 70));
}
else
- logf (LOG_LOG, "%0.*s",
+ logf (LOG_LOG, "%.*s",
fc.record_int_len, fc.record_int_buf);
/* the following two lines makes rec_rm delete buf */
retrieveCtrl.diagnostic = 0;
retrieveCtrl.dh = zh->dh;
retrieveCtrl.res = zh->res;
- (*rt->retrieve)(&retrieveCtrl);
+ (*rt->retrieve)(clientData, &retrieveCtrl);
*output_format = retrieveCtrl.output_format;
- *rec_bufp = retrieveCtrl.rec_buf;
+ *rec_bufp = (char *) retrieveCtrl.rec_buf;
*rec_lenp = retrieveCtrl.rec_len;
if (fc.fd != -1)
close (fc.fd);