ptp2: make ptp_add_event(s) cleaner and more performant
This commit is contained in:
@@ -3257,27 +3257,22 @@ ptp_add_event_queue (PTPContainer **events, unsigned int *nrevents, PTPContainer
|
||||
(*nrevents)++;
|
||||
return PTP_RC_OK;
|
||||
}
|
||||
uint16_t
|
||||
ptp_add_event (PTPParams *params, PTPContainer *evt)
|
||||
{
|
||||
return ptp_add_event_queue (¶ms->events, ¶ms->nrofevents, evt);
|
||||
/*
|
||||
params->events = realloc(params->events, sizeof(PTPContainer)*(params->nrofevents+1));
|
||||
memcpy (¶ms->events[params->nrofevents],evt,1*sizeof(PTPContainer));
|
||||
params->nrofevents += 1;
|
||||
|
||||
return PTP_RC_OK;
|
||||
*/
|
||||
uint16_t
|
||||
ptp_add_event (PTPParams *params, PTPContainer *event)
|
||||
{
|
||||
return ptp_add_events (params, event, 1);
|
||||
}
|
||||
|
||||
uint16_t
|
||||
ptp_add_events (PTPParams *params, PTPContainer *evt, unsigned int nrevents)
|
||||
ptp_add_events (PTPParams *params, PTPContainer *events, unsigned int count)
|
||||
{
|
||||
unsigned int i;
|
||||
params->events = realloc(params->events, sizeof(PTPContainer)*(count+params->nrofevents));
|
||||
if (!params->events)
|
||||
return PTP_RC_GeneralError;
|
||||
|
||||
for (i=0;i<nrevents;i++) {
|
||||
CHECK_PTP_RC (ptp_add_event_queue (¶ms->events, ¶ms->nrofevents, &evt[i]));
|
||||
}
|
||||
memcpy (¶ms->events[params->nrofevents], events, count*sizeof(PTPContainer));
|
||||
params->nrofevents += count;
|
||||
return PTP_RC_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -4139,8 +4139,8 @@ uint16_t ptp_getstream (PTPParams* params, unsigned char **data, unsigned int *s
|
||||
uint16_t ptp_check_event (PTPParams *params);
|
||||
uint16_t ptp_check_event_queue (PTPParams *params);
|
||||
uint16_t ptp_wait_event (PTPParams *params);
|
||||
uint16_t ptp_add_event (PTPParams *params, PTPContainer *evt);
|
||||
uint16_t ptp_add_events (PTPParams *params, PTPContainer *evt, unsigned int nrevents);
|
||||
uint16_t ptp_add_event (PTPParams *params, PTPContainer *event);
|
||||
uint16_t ptp_add_events (PTPParams *params, PTPContainer *event, unsigned int count);
|
||||
uint16_t ptp_add_event_queue (PTPContainer **events, unsigned int *nrevents, PTPContainer *evt);
|
||||
int ptp_get_one_event (PTPParams *params, PTPContainer *evt);
|
||||
int ptp_get_one_event_by_type(PTPParams *params, uint16_t code, PTPContainer *event);
|
||||
|
||||
Reference in New Issue
Block a user