From f8735b76f8ff170a2976ded9cdd934a23f45ca92 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 21 Sep 2010 22:43:42 +0200 Subject: [PATCH] Transfotm data.c printf() into UI oprintf() --- src/data.c | 547 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 274 insertions(+), 273 deletions(-) diff --git a/src/data.c b/src/data.c index 1be226e..86ed480 100644 --- a/src/data.c +++ b/src/data.c @@ -12,49 +12,50 @@ #include #include "shigofumi.h" +#include "ui.h" void print_DbState(const long int state) { switch(state) { - case DBSTATE_ACCESSIBLE: printf("ACCESSIBLE\n"); break; - case DBSTATE_TEMP_UNACCESSIBLE: printf("TEMP_UNACCESSIBLE\n"); break; - case DBSTATE_NOT_YET_ACCESSIBLE: printf("NOT_YET_ACCESSIBLE\n"); break; - case DBSTATE_PERM_UNACCESSIBLE: printf("PERM_UNACCESSIBLE\n"); break; - case DBSTATE_REMOVED: printf("REMOVED\n"); break; - default: printf("\n", state); + case DBSTATE_ACCESSIBLE: oprintf("ACCESSIBLE\n"); break; + case DBSTATE_TEMP_UNACCESSIBLE: oprintf("TEMP_UNACCESSIBLE\n"); break; + case DBSTATE_NOT_YET_ACCESSIBLE: oprintf("NOT_YET_ACCESSIBLE\n"); break; + case DBSTATE_PERM_UNACCESSIBLE: oprintf("PERM_UNACCESSIBLE\n"); break; + case DBSTATE_REMOVED: oprintf("REMOVED\n"); break; + default: oprintf("\n", state); } } void print_DbType(const long int *type) { - if (!type) printf("NULL\n"); + if (!type) oprintf("NULL\n"); else switch(*type) { - case DBTYPE_SYSTEM: printf("SYSTEM\n"); break; - case DBTYPE_FO: printf("FO\n"); break; - case DBTYPE_PFO: printf("PFO\n"); break; - case DBTYPE_PFO_ADVOK: printf("PFO_ADVOK\n"); break; - case DBTYPE_PFO_DANPOR: printf("PFO_DAPOR\n"); break; - case DBTYPE_PFO_INSSPR: printf("PFO_INSSPR\n"); break; - case DBTYPE_PO: printf("PO\n"); break; - case DBTYPE_PO_ZAK: printf("PO_ZAK\n"); break; - case DBTYPE_PO_REQ: printf("PO_REQ\n"); break; - case DBTYPE_OVM: printf("OVM\n"); break; - case DBTYPE_OVM_NOTAR: printf("OVM_NOTAR\n"); break; - case DBTYPE_OVM_EXEKUT: printf("OVM_EXEKUT\n"); break; - case DBTYPE_OVM_REQ: printf("OVM_REQ\n"); break; - default: printf("\n", *type); + case DBTYPE_SYSTEM: oprintf("SYSTEM\n"); break; + case DBTYPE_FO: oprintf("FO\n"); break; + case DBTYPE_PFO: oprintf("PFO\n"); break; + case DBTYPE_PFO_ADVOK: oprintf("PFO_ADVOK\n"); break; + case DBTYPE_PFO_DANPOR: oprintf("PFO_DAPOR\n"); break; + case DBTYPE_PFO_INSSPR: oprintf("PFO_INSSPR\n"); break; + case DBTYPE_PO: oprintf("PO\n"); break; + case DBTYPE_PO_ZAK: oprintf("PO_ZAK\n"); break; + case DBTYPE_PO_REQ: oprintf("PO_REQ\n"); break; + case DBTYPE_OVM: oprintf("OVM\n"); break; + case DBTYPE_OVM_NOTAR: oprintf("OVM_NOTAR\n"); break; + case DBTYPE_OVM_EXEKUT: oprintf("OVM_EXEKUT\n"); break; + case DBTYPE_OVM_REQ: oprintf("OVM_REQ\n"); break; + default: oprintf("\n", *type); } } void print_UserType(const long int *type) { - if (!type) printf("NULL\n"); + if (!type) oprintf("NULL\n"); else switch(*type) { - case USERTYPE_PRIMARY: printf("PRIMARY\n"); break; - case USERTYPE_ENTRUSTED: printf("ENTRUSTED\n"); break; - case USERTYPE_ADMINISTRATOR: printf("ADMINISTRATOR\n"); break; - case USERTYPE_OFFICIAL: printf("OFFICIAL\n"); break; - default: printf("\n", *type); + case USERTYPE_PRIMARY: oprintf("PRIMARY\n"); break; + case USERTYPE_ENTRUSTED: oprintf("ENTRUSTED\n"); break; + case USERTYPE_ADMINISTRATOR: oprintf("ADMINISTRATOR\n"); break; + case USERTYPE_OFFICIAL: oprintf("OFFICIAL\n"); break; + default: oprintf("\n", *type); } } @@ -73,209 +74,209 @@ void print_UserPrivils(const long int *privils) { }; const int priviledges_count = sizeof(priviledges)/sizeof(priviledges[0]); - if (!privils) printf("NULL\n"); + if (!privils) oprintf("NULL\n"); else { - printf("%ld (", *privils); + oprintf("%ld (", *privils); for (int i = 0; i < priviledges_count; i++) { if (*privils & (1<algorithm) { - case HASH_ALGORITHM_MD5: printf("MD5 "); break; - case HASH_ALGORITHM_SHA_1: printf("SHA-1 "); break; - case HASH_ALGORITHM_SHA_256: printf("SHA-256 "); break; - case HASH_ALGORITHM_SHA_512: printf("SHA-512 "); break; - default: printf(" ", hash->algorithm); + case HASH_ALGORITHM_MD5: oprintf("MD5 "); break; + case HASH_ALGORITHM_SHA_1: oprintf("SHA-1 "); break; + case HASH_ALGORITHM_SHA_256: oprintf("SHA-256 "); break; + case HASH_ALGORITHM_SHA_512: oprintf("SHA-512 "); break; + default: oprintf(" ", hash->algorithm); break; } - if (!hash->value) printf(""); + if (!hash->value) oprintf(""); else for (int i = 0; i < hash->length; i++) { - if (i > 0) printf(":"); - printf("%02x", ((uint8_t *)(hash->value))[i]); + if (i > 0) oprintf(":"); + oprintf("%02x", ((uint8_t *)(hash->value))[i]); } - printf("\n"); + oprintf("\n"); } void print_raw_type(const isds_raw_type type) { switch(type) { case RAWTYPE_INCOMING_MESSAGE: - printf("INCOMING_MESSAGE\n"); break; + oprintf("INCOMING_MESSAGE\n"); break; case RAWTYPE_PLAIN_SIGNED_INCOMING_MESSAGE: - printf("PLAIN_SIGNED_INCOMING_MESSAGE\n"); break; + oprintf("PLAIN_SIGNED_INCOMING_MESSAGE\n"); break; case RAWTYPE_CMS_SIGNED_INCOMING_MESSAGE: - printf("CMS_SIGNED_INCOMING_MESSAGE\n"); break; + oprintf("CMS_SIGNED_INCOMING_MESSAGE\n"); break; case RAWTYPE_PLAIN_SIGNED_OUTGOING_MESSAGE: - printf("PLAIN_SIGNED_OUTGOING_MESSAGE\n"); break; + oprintf("PLAIN_SIGNED_OUTGOING_MESSAGE\n"); break; case RAWTYPE_CMS_SIGNED_OUTGOING_MESSAGE: - printf("CMS_SIGNED_OUTGOING_MESSAGE\n"); break; + oprintf("CMS_SIGNED_OUTGOING_MESSAGE\n"); break; case RAWTYPE_DELIVERYINFO: - printf("DELIVERYINFO\n"); break; + oprintf("DELIVERYINFO\n"); break; case RAWTYPE_PLAIN_SIGNED_DELIVERYINFO: - printf("PLAIN_SIGNED_DELIVERYINFO\n"); break; + oprintf("PLAIN_SIGNED_DELIVERYINFO\n"); break; case RAWTYPE_CMS_SIGNED_DELIVERYINFO: - printf("CMS_SIGNED_DELIVERYINFO\n"); break; + oprintf("CMS_SIGNED_DELIVERYINFO\n"); break; default: - printf(" ", type); + oprintf(" ", type); break; } } void print_bool(const _Bool *boolean) { - printf("%s\n", (!boolean) ? "NULL" : ((*boolean)? "true" : "false") ); + oprintf("%s\n", (!boolean) ? "NULL" : ((*boolean)? "true" : "false") ); } void print_longint(const long int *number) { - if (!number) printf("NULL\n"); - else printf("%ld\n", *number); + if (!number) oprintf("NULL\n"); + else oprintf("%ld\n", *number); } void print_PersonName(const struct isds_PersonName *personName) { - printf("\tpersonName = "); - if (!personName) printf("NULL\n"); + oprintf("\tpersonName = "); + if (!personName) oprintf("NULL\n"); else { - printf("{\n"); - printf("\t\tpnFirstName = %s\n", personName->pnFirstName); - printf("\t\tpnMiddleName = %s\n", personName->pnMiddleName); - printf("\t\tpnLastName = %s\n", personName->pnLastName); - printf("\t\tpnLastNameAtBirth = %s\n", personName->pnLastNameAtBirth); - printf("\t}\n"); + oprintf("{\n"); + oprintf("\t\tpnFirstName = %s\n", personName->pnFirstName); + oprintf("\t\tpnMiddleName = %s\n", personName->pnMiddleName); + oprintf("\t\tpnLastName = %s\n", personName->pnLastName); + oprintf("\t\tpnLastNameAtBirth = %s\n", personName->pnLastNameAtBirth); + oprintf("\t}\n"); } } void print_Address(const struct isds_Address *address) { - printf("\taddress = "); - if (!address) printf("NULL\n"); + oprintf("\taddress = "); + if (!address) oprintf("NULL\n"); else { - printf("{\n"); - printf("\t\tadCity = %s\n", address->adCity); - printf("\t\tadStreet = %s\n", address->adStreet); - printf("\t\tadNumberInStreet = %s\n", address->adNumberInStreet); - printf("\t\tadNumberInMunicipality = %s\n", + oprintf("{\n"); + oprintf("\t\tadCity = %s\n", address->adCity); + oprintf("\t\tadStreet = %s\n", address->adStreet); + oprintf("\t\tadNumberInStreet = %s\n", address->adNumberInStreet); + oprintf("\t\tadNumberInMunicipality = %s\n", address->adNumberInMunicipality); - printf("\t\tadZipCode = %s\n", address->adZipCode); - printf("\t\tadState = %s\n", address->adState); - printf("\t}\n"); + oprintf("\t\tadZipCode = %s\n", address->adZipCode); + oprintf("\t\tadState = %s\n", address->adState); + oprintf("\t}\n"); } } void print_date(const struct tm *date) { - if (!date) printf("NULL\n"); - else printf("%s", asctime(date)); + if (!date) oprintf("NULL\n"); + else oprintf("%s", asctime(date)); } void print_DbOwnerInfo(const struct isds_DbOwnerInfo *info) { - printf("dbOwnerInfo = "); + oprintf("dbOwnerInfo = "); if (!info) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("{\n"); - printf("\tdbID = %s\n", info->dbID); + oprintf("{\n"); + oprintf("\tdbID = %s\n", info->dbID); - printf("\tdbType = "); + oprintf("\tdbType = "); print_DbType((long int *) (info->dbType)); - printf("\tic = %s\n", info->ic); + oprintf("\tic = %s\n", info->ic); print_PersonName(info->personName); - printf("\tfirmName = %s\n", info->firmName); + oprintf("\tfirmName = %s\n", info->firmName); - printf("\tbirthInfo = "); - if (!info->birthInfo) printf("NULL\n"); + oprintf("\tbirthInfo = "); + if (!info->birthInfo) oprintf("NULL\n"); else { - printf("{\n"); + oprintf("{\n"); - printf("\t\tbiDate = "); + oprintf("\t\tbiDate = "); print_date(info->birthInfo->biDate); - printf("\t\tbiCity = %s\n", info->birthInfo->biCity); - printf("\t\tbiCounty = %s\n", info->birthInfo->biCounty); - printf("\t\tbiState = %s\n", info->birthInfo->biState); - printf("\t}\n"); + oprintf("\t\tbiCity = %s\n", info->birthInfo->biCity); + oprintf("\t\tbiCounty = %s\n", info->birthInfo->biCounty); + oprintf("\t\tbiState = %s\n", info->birthInfo->biState); + oprintf("\t}\n"); } print_Address(info->address); - printf("\tnationality = %s\n", info->nationality); - printf("\temail = %s\n", info->email); - printf("\ttelNumber = %s\n", info->telNumber); - printf("\tidentifier = %s\n", info->identifier); - printf("\tregistryCode = %s\n", info->registryCode); + oprintf("\tnationality = %s\n", info->nationality); + oprintf("\temail = %s\n", info->email); + oprintf("\ttelNumber = %s\n", info->telNumber); + oprintf("\tidentifier = %s\n", info->identifier); + oprintf("\tregistryCode = %s\n", info->registryCode); - printf("\tdbState = "); - if (!info->dbState) printf("NULL\n"); + oprintf("\tdbState = "); + if (!info->dbState) oprintf("NULL\n"); else print_DbState(*(info->dbState)); - printf("\tdbEffectiveOVM = "); + oprintf("\tdbEffectiveOVM = "); print_bool(info->dbEffectiveOVM); - printf("\tdbOpenAddressing = "); + oprintf("\tdbOpenAddressing = "); print_bool(info->dbOpenAddressing); - printf("}\n"); + oprintf("}\n"); } void print_DbUserInfo(const struct isds_DbUserInfo *info) { - printf("dbUserInfo = "); + oprintf("dbUserInfo = "); if (!info) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("{\n"); - printf("\tuserID = %s\n", info->userID); + oprintf("{\n"); + oprintf("\tuserID = %s\n", info->userID); - printf("\tuserType = "); + oprintf("\tuserType = "); print_UserType((long int *) (info->userType)); - printf("\tuserPrivils = "); + oprintf("\tuserPrivils = "); print_UserPrivils(info->userPrivils); print_PersonName(info->personName); print_Address(info->address); - printf("\tbiDate = "); + oprintf("\tbiDate = "); print_date(info->biDate); - printf("\tic = %s\n", info->ic); - printf("\tfirmName = %s\n", info->firmName); + oprintf("\tic = %s\n", info->ic); + oprintf("\tfirmName = %s\n", info->firmName); - printf("\tcaStreet = %s\n", info->caStreet); - printf("\tcaCity = %s\n", info->caCity); - printf("\tcaZipCode = %s\n", info->caZipCode); + oprintf("\tcaStreet = %s\n", info->caStreet); + oprintf("\tcaCity = %s\n", info->caCity); + oprintf("\tcaZipCode = %s\n", info->caZipCode); - printf("}\n"); + oprintf("}\n"); } @@ -284,36 +285,36 @@ void print_timeval(const struct timeval *time) { char buffer[128]; if (!time) { - printf("NULL\n"); + oprintf("NULL\n"); return; } if (!localtime_r(&(time->tv_sec), &broken)) goto error; if (!strftime(buffer, sizeof(buffer)/sizeof(char), "%c", &broken)) goto error; - printf("%s, %ld us\n", buffer, time->tv_usec); + oprintf("%s, %ld us\n", buffer, time->tv_usec); return; error: - printf("\n>"); + oprintf("\n>"); return; } void print_event_type(const isds_event_type *type) { if (!type) { - printf("NULL"); + oprintf("NULL"); return; } switch (*type) { - case EVENT_UKNOWN: printf("UNKNOWN\n"); break; + case EVENT_UKNOWN: oprintf("UNKNOWN\n"); break; case EVENT_ACCEPTED_BY_RECIPIENT: - printf("ACCEPTED_BY_RECIPIENT\n"); break; + oprintf("ACCEPTED_BY_RECIPIENT\n"); break; case EVENT_ACCEPTED_BY_FICTION: - printf("DELIVERED_BY_FICTION\n"); break; + oprintf("DELIVERED_BY_FICTION\n"); break; case EVENT_UNDELIVERABLE: - printf("UNDELIVERABLE\n"); break; - default: printf("\n", *type); + oprintf("UNDELIVERABLE\n"); break; + default: oprintf("\n", *type); } } @@ -323,238 +324,238 @@ void print_events(const struct isds_list *events) { const struct isds_event *event; if (!events) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("{\n"); + oprintf("{\n"); for (item = events; item; item = item->next) { event = (struct isds_event *) item->data; - printf("\t\t\tevent = "); - if (!event) printf("NULL"); + oprintf("\t\t\tevent = "); + if (!event) oprintf("NULL"); else { - printf("{\n"); + oprintf("{\n"); - printf("\t\t\t\ttype = "); + oprintf("\t\t\t\ttype = "); print_event_type(event->type); - printf("\t\t\t\tdescription = %s\n", event->description); + oprintf("\t\t\t\tdescription = %s\n", event->description); - printf("\t\t\t\ttime = "); + oprintf("\t\t\t\ttime = "); print_timeval(event->time); - printf("\t\t\t}\n"); + oprintf("\t\t\t}\n"); } } - printf("\t\t}\n"); + oprintf("\t\t}\n"); } void print_envelope(const struct isds_envelope *envelope) { - printf("\tenvelope = "); + oprintf("\tenvelope = "); if (!envelope) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("{\n"); + oprintf("{\n"); - printf("\t\tdmID = %s\n", envelope->dmID); - printf("\t\tdbIDSender = %s\n", envelope->dbIDSender); - printf("\t\tdmSender = %s\n", envelope->dmSender); - printf("\t\tdmSenderAddress = %s\n", envelope->dmSenderAddress); - printf("\t\tdmSenderType = "); + oprintf("\t\tdmID = %s\n", envelope->dmID); + oprintf("\t\tdbIDSender = %s\n", envelope->dbIDSender); + oprintf("\t\tdmSender = %s\n", envelope->dmSender); + oprintf("\t\tdmSenderAddress = %s\n", envelope->dmSenderAddress); + oprintf("\t\tdmSenderType = "); print_DbType(envelope->dmSenderType); - printf("\t\tdmRecipient = %s\n", envelope->dmRecipient); - printf("\t\tdmRecipientAddress = %s\n", envelope->dmRecipientAddress); - printf("\t\tdmAmbiguousRecipient = "); + oprintf("\t\tdmRecipient = %s\n", envelope->dmRecipient); + oprintf("\t\tdmRecipientAddress = %s\n", envelope->dmRecipientAddress); + oprintf("\t\tdmAmbiguousRecipient = "); print_bool(envelope->dmAmbiguousRecipient); - printf("\t\tdmType = %s\n", envelope->dmType); + oprintf("\t\tdmType = %s\n", envelope->dmType); - printf("\t\tdmSenderOrgUnit = %s\n", envelope->dmSenderOrgUnit); - printf("\t\tdmSenderOrgUnitNum = "); + oprintf("\t\tdmSenderOrgUnit = %s\n", envelope->dmSenderOrgUnit); + oprintf("\t\tdmSenderOrgUnitNum = "); print_longint(envelope->dmSenderOrgUnitNum); - printf("\t\tdbIDRecipient = %s\n", envelope->dbIDRecipient); - printf("\t\tdmRecipientOrgUnit = %s\n", envelope->dmRecipientOrgUnit); - printf("\t\tdmRecipientOrgUnitNum = "); + oprintf("\t\tdbIDRecipient = %s\n", envelope->dbIDRecipient); + oprintf("\t\tdmRecipientOrgUnit = %s\n", envelope->dmRecipientOrgUnit); + oprintf("\t\tdmRecipientOrgUnitNum = "); print_longint(envelope->dmRecipientOrgUnitNum); - printf("\t\tdmToHands = %s\n", envelope->dmToHands); - printf("\t\tdmAnnotation = %s\n", envelope->dmAnnotation); - printf("\t\tdmRecipientRefNumber = %s\n", envelope->dmRecipientRefNumber); - printf("\t\tdmSenderRefNumber = %s\n", envelope->dmSenderRefNumber); - printf("\t\tdmRecipientIdent = %s\n", envelope->dmRecipientIdent); - printf("\t\tdmSenderIdent = %s\n", envelope->dmSenderIdent); - - printf("\t\tdmLegalTitleLaw = "); + oprintf("\t\tdmToHands = %s\n", envelope->dmToHands); + oprintf("\t\tdmAnnotation = %s\n", envelope->dmAnnotation); + oprintf("\t\tdmRecipientRefNumber = %s\n", envelope->dmRecipientRefNumber); + oprintf("\t\tdmSenderRefNumber = %s\n", envelope->dmSenderRefNumber); + oprintf("\t\tdmRecipientIdent = %s\n", envelope->dmRecipientIdent); + oprintf("\t\tdmSenderIdent = %s\n", envelope->dmSenderIdent); + + oprintf("\t\tdmLegalTitleLaw = "); print_longint(envelope->dmLegalTitleLaw); - printf("\t\tdmLegalTitleYear = "); + oprintf("\t\tdmLegalTitleYear = "); print_longint(envelope->dmLegalTitleYear); - printf("\t\tdmLegalTitleSect = %s\n", envelope->dmLegalTitleSect); - printf("\t\tdmLegalTitlePar = %s\n", envelope->dmLegalTitlePar); - printf("\t\tdmLegalTitlePoint = %s\n", envelope->dmLegalTitlePoint); + oprintf("\t\tdmLegalTitleSect = %s\n", envelope->dmLegalTitleSect); + oprintf("\t\tdmLegalTitlePar = %s\n", envelope->dmLegalTitlePar); + oprintf("\t\tdmLegalTitlePoint = %s\n", envelope->dmLegalTitlePoint); - printf("\t\tdmPersonalDelivery = "); + oprintf("\t\tdmPersonalDelivery = "); print_bool(envelope->dmPersonalDelivery); - printf("\t\tdmAllowSubstDelivery = "); + oprintf("\t\tdmAllowSubstDelivery = "); print_bool(envelope->dmAllowSubstDelivery); - printf("\t\tdmOVM = "); + oprintf("\t\tdmOVM = "); print_bool(envelope->dmOVM); - printf("\t\tdmOrdinal = "); - if (!envelope->dmOrdinal) printf("NULL\n"); - else printf("%lu\n", *(envelope->dmOrdinal)); + oprintf("\t\tdmOrdinal = "); + if (!envelope->dmOrdinal) oprintf("NULL\n"); + else oprintf("%lu\n", *(envelope->dmOrdinal)); - printf("\t\tdmMessageStatus = "); - if (!envelope->dmMessageStatus) printf("NULL\n"); + oprintf("\t\tdmMessageStatus = "); + if (!envelope->dmMessageStatus) oprintf("NULL\n"); else switch(*(envelope->dmMessageStatus)) { - case MESSAGESTATE_SENT: printf("SENT\n"); break; - case MESSAGESTATE_STAMPED: printf("STAMPED\n"); break; - case MESSAGESTATE_INFECTED: printf("INFECTED\n"); break; - case MESSAGESTATE_DELIVERED: printf("DELIVERED\n"); break; - case MESSAGESTATE_SUBSTITUTED: printf("SUBSTITUTED\n"); break; - case MESSAGESTATE_RECEIVED: printf("RECEIVED\n"); break; - case MESSAGESTATE_READ: printf("READ\n"); break; - case MESSAGESTATE_UNDELIVERABLE: printf("UNDELIVERABLE\n"); break; - case MESSAGESTATE_REMOVED: printf("REMOVED\n"); break; - case MESSAGESTATE_IN_SAFE: printf("IN_SAFE\n"); break; - default: printf("\n", + case MESSAGESTATE_SENT: oprintf("SENT\n"); break; + case MESSAGESTATE_STAMPED: oprintf("STAMPED\n"); break; + case MESSAGESTATE_INFECTED: oprintf("INFECTED\n"); break; + case MESSAGESTATE_DELIVERED: oprintf("DELIVERED\n"); break; + case MESSAGESTATE_SUBSTITUTED: oprintf("SUBSTITUTED\n"); break; + case MESSAGESTATE_RECEIVED: oprintf("RECEIVED\n"); break; + case MESSAGESTATE_READ: oprintf("READ\n"); break; + case MESSAGESTATE_UNDELIVERABLE: oprintf("UNDELIVERABLE\n"); break; + case MESSAGESTATE_REMOVED: oprintf("REMOVED\n"); break; + case MESSAGESTATE_IN_SAFE: oprintf("IN_SAFE\n"); break; + default: oprintf("\n", *(envelope->dmMessageStatus)); } - printf("\t\tdmAttachmentSize = "); - if (!envelope->dmAttachmentSize) printf("NULL\n"); - else printf("%lu kB\n", *(envelope->dmAttachmentSize)); + oprintf("\t\tdmAttachmentSize = "); + if (!envelope->dmAttachmentSize) oprintf("NULL\n"); + else oprintf("%lu kB\n", *(envelope->dmAttachmentSize)); - printf("\t\tdmDeliveryTime = "); + oprintf("\t\tdmDeliveryTime = "); print_timeval(envelope->dmDeliveryTime); - printf("\t\tdmAcceptanceTime = "); + oprintf("\t\tdmAcceptanceTime = "); print_timeval(envelope->dmAcceptanceTime); - printf("\t\thash = "); + oprintf("\t\thash = "); print_hash(envelope->hash); - printf("\t\ttimestamp = %p\n", envelope->timestamp); - printf("\t\ttimestamp_length = %zu\n", envelope->timestamp_length); + oprintf("\t\ttimestamp = %p\n", envelope->timestamp); + oprintf("\t\ttimestamp_length = %zu\n", envelope->timestamp_length); - printf("\t\tevents = "); + oprintf("\t\tevents = "); print_events(envelope->events); - printf("\t}\n"); + oprintf("\t}\n"); } void print_document(const struct isds_document *document) { - printf("\t\tdocument = "); + oprintf("\t\tdocument = "); if (!document) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("\{\n"); + oprintf("\{\n"); - printf("\t\t\tis_xml = %u\n", !!document->is_xml); - printf("\t\t\txml_node_list = %p\n", document->xml_node_list); + oprintf("\t\t\tis_xml = %u\n", !!document->is_xml); + oprintf("\t\t\txml_node_list = %p\n", document->xml_node_list); - printf("\t\t\tdata = %p\n", document->data); - printf("\t\t\tdata_length = %zu\n", document->data_length); - printf("\t\t\tdmMimeType = %s\n", document->dmMimeType); + oprintf("\t\t\tdata = %p\n", document->data); + oprintf("\t\t\tdata_length = %zu\n", document->data_length); + oprintf("\t\t\tdmMimeType = %s\n", document->dmMimeType); - printf("\t\t\tdmFileMetaType = "); + oprintf("\t\t\tdmFileMetaType = "); switch(document->dmFileMetaType) { - case FILEMETATYPE_MAIN: printf("MAIN\n"); break; - case FILEMETATYPE_ENCLOSURE: printf("ENCLOSURE\n"); break; - case FILEMETATYPE_SIGNATURE: printf("SIGNATURE\n"); break; - case FILEMETATYPE_META: printf("META\n"); break; - default: printf("\n", document->dmFileMetaType); + case FILEMETATYPE_MAIN: oprintf("MAIN\n"); break; + case FILEMETATYPE_ENCLOSURE: oprintf("ENCLOSURE\n"); break; + case FILEMETATYPE_SIGNATURE: oprintf("SIGNATURE\n"); break; + case FILEMETATYPE_META: oprintf("META\n"); break; + default: oprintf("\n", document->dmFileMetaType); } - printf("\t\t\tdmFileGuid = %s\n", document->dmFileGuid); - printf("\t\t\tdmUpFileGuid = %s\n", document->dmUpFileGuid); - printf("\t\t\tdmFileDescr = %s\n", document->dmFileDescr); - printf("\t\t\tdmFormat = %s\n", document->dmFormat); - printf("\t\t}\n"); + oprintf("\t\t\tdmFileGuid = %s\n", document->dmFileGuid); + oprintf("\t\t\tdmUpFileGuid = %s\n", document->dmUpFileGuid); + oprintf("\t\t\tdmFileDescr = %s\n", document->dmFileDescr); + oprintf("\t\t\tdmFormat = %s\n", document->dmFormat); + oprintf("\t\t}\n"); } void print_documents(const struct isds_list *documents) { const struct isds_list *item; - printf("\tdocuments = "); + oprintf("\tdocuments = "); if (!documents) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("{\n"); + oprintf("{\n"); for (item = documents; item; item = item->next) { print_document((struct isds_document *) (item->data)); } - printf("\t}\n"); + oprintf("\t}\n"); } void print_message(const struct isds_message *message) { - printf("message = "); + oprintf("message = "); if (!message) { - printf("NULL\n"); + oprintf("NULL\n"); return; } - printf("{\n"); + oprintf("{\n"); - printf("\traw = %p\n", message->raw); - printf("\traw_length = %zu\n", message->raw_length); - printf("\traw_type = "); + oprintf("\traw = %p\n", message->raw); + oprintf("\traw_length = %zu\n", message->raw_length); + oprintf("\traw_type = "); print_raw_type(message->raw_type); print_envelope(message->envelope); print_documents(message->documents); - printf("}\n"); + oprintf("}\n"); } void print_copies(const struct isds_list *copies) { const struct isds_list *item; struct isds_message_copy *copy; - printf("Copies = "); + oprintf("Copies = "); if (!copies) { - printf("\n"); + oprintf("\n"); return; } - printf("{\n"); + oprintf("{\n"); for (item = copies; item; item = item->next) { copy = (struct isds_message_copy *) item->data; - printf("\tCopy = "); + oprintf("\tCopy = "); if (!copy) - printf("\n"); + oprintf("\n"); else { - printf("{\n"); - printf("\t\tdbIDRecipient = %s\n", copy->dbIDRecipient); - printf("\t\tdmRecipientOrgUnit = %s\n", copy->dmRecipientOrgUnit); + oprintf("{\n"); + oprintf("\t\tdbIDRecipient = %s\n", copy->dbIDRecipient); + oprintf("\t\tdmRecipientOrgUnit = %s\n", copy->dmRecipientOrgUnit); - printf("\t\tdmRecipientOrgUnitNum = "); + oprintf("\t\tdmRecipientOrgUnitNum = "); if (copy->dmRecipientOrgUnitNum) - printf("%ld\n", *copy->dmRecipientOrgUnitNum); + oprintf("%ld\n", *copy->dmRecipientOrgUnitNum); else - printf("\n"); - printf("\t\tdmToHands = %s\n", copy->dmToHands); + oprintf("\n"); + oprintf("\t\tdmToHands = %s\n", copy->dmToHands); - printf("\t\terror = %s\n", isds_strerror(copy->error)); - printf("\t\tdmStatus = %s\n", copy->dmStatus); - printf("\t\tdmID = %s\n", copy->dmID); - printf("\t}\n"); + oprintf("\t\terror = %s\n", isds_strerror(copy->error)); + oprintf("\t\tdmStatus = %s\n", copy->dmStatus); + oprintf("\t\tdmID = %s\n", copy->dmID); + oprintf("\t}\n"); } } - printf("}\n"); + oprintf("}\n"); } @@ -562,14 +563,14 @@ void compare_hashes(const struct isds_hash *hash1, const struct isds_hash *hash2) { isds_error err; - printf("Comparing hashes... "); + oprintf("Comparing hashes... "); err = isds_hash_cmp(hash1, hash2); if (err == IE_SUCCESS) - printf("Hashes equal\n"); + oprintf("Hashes equal\n"); else if - (err == IE_NOTEQUAL) printf("Hashes differ\n"); + (err == IE_NOTEQUAL) oprintf("Hashes differ\n"); else - printf("isds_hash_cmp() failed: %s\n", isds_strerror(err)); + oprintf("isds_hash_cmp() failed: %s\n", isds_strerror(err)); } @@ -577,7 +578,7 @@ int progressbar(double upload_total, double upload_current, double download_total, double download_current, void *data) { - printf("Progress: upload %0f/%0f, download %0f/%0f, data=%p\n", + oprintf("Progress: upload %0f/%0f, download %0f/%0f, data=%p\n", upload_current, upload_total, download_current, download_total, data); return 0; @@ -588,7 +589,7 @@ int progressbar(double upload_total, double upload_current, * @header is locale encoded header name * @value is locale encoded header value */ void print_header(const char *header, const char *value) { - if (value && *value) printf(_("%s: %s\n"), header, value); + if (value && *value) oprintf(_("%s: %s\n"), header, value); } @@ -602,14 +603,14 @@ void print_header_bool(const char *header, _Bool *value) { /* Print formatted header if long int value is defined. * @header is locale encoded header name */ void print_header_longint(const char *header, long int *value) { - if (value) printf(_("%s: %ld\n"), header, *value); + if (value) oprintf(_("%s: %ld\n"), header, *value); } /* Print formatted header if unsigned long int value is defined. * @header is locale encoded header name */ void print_header_ulongint(const char *header, unsigned long int *value) { - if (value) printf(_("%s: %ld\n"), header, *value); + if (value) oprintf(_("%s: %ld\n"), header, *value); } @@ -626,16 +627,16 @@ void print_header_timeval(const char *header, struct timeval *time) { goto error; if (!time->tv_usec) - printf(_("%s: %s\n"), header, buffer); + oprintf(_("%s: %s\n"), header, buffer); else if ((time->tv_usec % 1000) == 0) - printf(_("%s: %s, %ld ms\n"), header, buffer, time->tv_usec/1000); + oprintf(_("%s: %s, %ld ms\n"), header, buffer, time->tv_usec/1000); else - printf(_("%s: %s, %ld us\n"), header, buffer, time->tv_usec); + oprintf(_("%s: %s, %ld us\n"), header, buffer, time->tv_usec); return; error: - printf(_("%s: \n"), header); + oprintf(_("%s: \n"), header); return; } @@ -743,7 +744,7 @@ static char *UserPrivils2string(const long int *privils) { if (!privils) return NULL; - /*printf("%ld (", *privils);*/ + /*oprintf("%ld (", *privils);*/ for (int i = 0; i < priviledges_count; i++) { if (*privils & (1<dmAcceptanceTime || envelope->dmPersonalDelivery || envelope->dmAllowSubstDelivery || envelope->hash || envelope->dmOrdinal)) { - printf(_("Delivery data:\n")); + oprintf(_("Delivery data:\n")); print_header(_("\tMessage type"), DmType2string(envelope->dmType)); print_header(_("\tMessage status"), DmMessageStatus2string(envelope->dmMessageStatus)); @@ -1034,14 +1035,14 @@ void print_delivery_events(const struct isds_list *events) { if (!events) return; - printf(_("Delivery events:\n")); + oprintf(_("Delivery events:\n")); for (item = events; item; item = item->next) { event = (struct isds_event *) item->data; if (!event) continue; order++; - printf(_("%*d %s\n"), counter_width, order, + oprintf(_("%*d %s\n"), counter_width, order, event_type2string(event->type)); print_header_utf8(_("\tDescription"), event->description); print_header_timeval(_("\tWhen"), event->time); @@ -1054,7 +1055,7 @@ void format_envelope(const struct isds_envelope *envelope) { char *law_string = NULL; if (!envelope) { - printf(_("\n")); + oprintf(_("\n")); return; } @@ -1064,7 +1065,7 @@ void format_envelope(const struct isds_envelope *envelope) { envelope->dmSenderOrgUnit || envelope->dmSenderOrgUnitNum || envelope->dmSenderAddress || envelope->dmSenderType || envelope->dmOVM) { - printf(_("Sender:\n")); + oprintf(_("Sender:\n")); print_header_utf8(_("\tID"), envelope->dbIDSender); print_header_utf8(_("\tName"), envelope->dmSender); print_header_utf8(_("\tUnit"), envelope->dmSenderOrgUnit); @@ -1078,7 +1079,7 @@ void format_envelope(const struct isds_envelope *envelope) { envelope->dmRecipientOrgUnit || envelope->dmRecipientOrgUnitNum || envelope->dmToHands || envelope->dmRecipientAddress || envelope->dmAmbiguousRecipient) { - printf(_("Recipient:\n")); + oprintf(_("Recipient:\n")); print_header_utf8(_("\tID"), envelope->dbIDRecipient); print_header_utf8(_("\tName"), envelope->dmRecipient); print_header_utf8(_("\tUnit"), envelope->dmRecipientOrgUnit); @@ -1105,8 +1106,8 @@ void format_envelope(const struct isds_envelope *envelope) { print_header_kbsize(_("Document total size"), envelope->dmAttachmentSize); - /*printf("\t\ttimestamp = %p\n", envelope->timestamp); - printf("\t\ttimestamp_length = %zu\n", envelope->timestamp_length);*/ + /*oprintf("\t\ttimestamp = %p\n", envelope->timestamp); + oprintf("\t\ttimestamp_length = %zu\n", envelope->timestamp_length);*/ print_delivery_events(envelope->events); } @@ -1216,14 +1217,14 @@ void format_document(const struct isds_document *document, int order, if (!document) return; - printf(_("%*d "), counter_width, order); + oprintf(_("%*d "), counter_width, order); if (document->dmFileDescr) { filename_locale = utf82locale(document->dmFileDescr); - printf("%s\n", filename_locale); + oprintf("%s\n", filename_locale); free(filename_locale); } else { - printf(_("\n")); + oprintf(_("\n")); } if (document->is_xml) { @@ -1258,7 +1259,7 @@ void format_documents(const struct isds_list *documents) { int *references; if (!documents) return; - printf(_("Documents:\n")); + oprintf(_("Documents:\n")); for (item = documents; item; item = item->next) { if (!item->data) continue; @@ -1291,7 +1292,7 @@ void format_copies(const struct isds_list *copies) { copy = (struct isds_message_copy *) item->data; i++; - printf(_("%*d Recipient:\n"), counter_width, i); + oprintf(_("%*d Recipient:\n"), counter_width, i); print_header_utf8(_("\tID"), copy->dbIDRecipient); print_header_utf8(_("\tUnit"), copy->dmRecipientOrgUnit); print_header_longint(_("\tUnit number"), copy->dmRecipientOrgUnitNum); @@ -1369,19 +1370,19 @@ void print_message_list(const struct isds_list *messages, _Bool outgoing) { fnprint(stdout, (outgoing) ? _("To") : _("From"), name_width); putchar(' '); fnprint(stdout, _("Subject"), subject_width); - printf("\n"); - for (int i = 0; i < screen_cols; i++) printf(_("-")); - printf("\n"); + oprintf("\n"); + for (int i = 0; i < screen_cols; i++) oprintf(_("-")); + oprintf("\n"); /* Print the list */ for (counter = 0, item = messages; item; item = item->next) { envelope = ((struct isds_message *) item->data)->envelope; counter++; - printf(_("%*lu "), counter_width, counter); + oprintf(_("%*lu "), counter_width, counter); if (!envelope) { - printf(_("\n")); + oprintf(_("\n")); continue; } @@ -1403,7 +1404,7 @@ void print_message_list(const struct isds_list *messages, _Bool outgoing) { fnprint(stdout, name_locale, name_width); putchar(' '); fnprint(stdout, subject_locale, subject_width); - printf("\n"); + oprintf("\n"); zfree(id_locale); zfree(time_locale); @@ -1416,7 +1417,7 @@ void print_message_list(const struct isds_list *messages, _Bool outgoing) { static void format_PersonName(const struct isds_PersonName *personName) { if (!personName) return; - printf(_("Person name:\n")); + oprintf(_("Person name:\n")); print_header_utf8("\tFirst", personName->pnFirstName); print_header_utf8("\tMiddle", personName->pnMiddleName); print_header_utf8("\tLast", personName->pnLastName); @@ -1474,7 +1475,7 @@ static void format_BirthInfo(const struct isds_BirthInfo *birth) { if (!birth || !(birth->biDate || birth->biCity || birth->biCounty || birth->biState)) return; - printf(_("Birth details:\n")); + oprintf(_("Birth details:\n")); date = tm2string(birth->biDate); print_header(_("\tDate"), date); @@ -1491,7 +1492,7 @@ static void format_Address(const struct isds_Address *address) { address->adNumberInStreet || address->adNumberInMunicipality || address->adZipCode || address->adState)) return; - printf("Address:\n"); + oprintf("Address:\n"); print_header_utf8(_("\tCity"), address->adCity); print_header_utf8(_("\tStreet"), address->adStreet); print_header_utf8(_("\tNumber in street"), address->adNumberInStreet); @@ -1547,7 +1548,7 @@ void format_DbOwnerInfo(const struct isds_DbOwnerInfo *info) { static void format_supervising_firm(const char *ic, const char *firmName) { if (!ic && !firmName) return; - printf(_("Supervising subject:\n")); + oprintf(_("Supervising subject:\n")); print_header_utf8(_("\tIdentity number"), ic); print_header_utf8(_("\tName"), firmName); } @@ -1557,7 +1558,7 @@ static void format_contact_address(const char *caStreet, const char *caCity, const char *caZipCode, const char *caState) { if (!caStreet && !caCity && !caZipCode) return; - printf(_("Contact address:\n")); + oprintf(_("Contact address:\n")); print_header_utf8(_("\tStreet"), caStreet); print_header_utf8(_("\tCity"), caCity); print_header_utf8(_("\tZIP code"), caZipCode); -- 2.11.4.GIT