projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add type casts to make YAZ C++ compile
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
b3bec5e
..
a58a7b3
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-760,7
+760,7
@@
int cmd_authentication(const char *arg)
}
else if (r == 1)
{
}
else if (r == 1)
{
- auth = nmem_malloc(nmem_auth, sizeof(*auth));
+ auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth));
if (!strcmp(args[0], "-"))
{
auth->which = Z_IdAuthentication_anonymous;
if (!strcmp(args[0], "-"))
{
auth->which = Z_IdAuthentication_anonymous;
@@
-776,9
+776,10
@@
int cmd_authentication(const char *arg)
}
else if (r == 2)
{
}
else if (r == 2)
{
- auth = nmem_malloc(nmem_auth, sizeof(*auth));
+ auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth));
auth->which = Z_IdAuthentication_idPass;
auth->which = Z_IdAuthentication_idPass;
- auth->u.idPass = nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
+ auth->u.idPass = (Z_IdPass *)
+ nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
auth->u.idPass->groupId = NULL;
auth->u.idPass->userId = !strcmp(args[0], "-") ? 0 : args[0];
auth->u.idPass->password = !strcmp(args[1], "-") ? 0 : args[1];
auth->u.idPass->groupId = NULL;
auth->u.idPass->userId = !strcmp(args[0], "-") ? 0 : args[0];
auth->u.idPass->password = !strcmp(args[1], "-") ? 0 : args[1];
@@
-787,9
+788,10
@@
int cmd_authentication(const char *arg)
}
else if (r == 3)
{
}
else if (r == 3)
{
- auth = nmem_malloc(nmem_auth, sizeof(*auth));
+ auth = (Z_IdAuthentication*) nmem_malloc(nmem_auth, sizeof(*auth));
auth->which = Z_IdAuthentication_idPass;
auth->which = Z_IdAuthentication_idPass;
- auth->u.idPass = nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
+ auth->u.idPass = (Z_IdPass *)
+ nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
auth->u.idPass->groupId = args[1];
auth->u.idPass->userId = args[0];
auth->u.idPass->password = args[2];
auth->u.idPass->groupId = args[1];
auth->u.idPass->userId = args[0];
auth->u.idPass->password = args[2];
@@
-3914,11
+3916,6
@@
static void handle_srw_record(Z_SRW_record *rec)
printf("\n");
if (rec->recordData_buf && rec->recordData_len)
{
printf("\n");
if (rec->recordData_buf && rec->recordData_len)
{
- if (fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout) !=
- (size_t) (rec->recordData_len))
- {
- printf("write to stdout failed\n");
- }
printf("%.*s", rec->recordData_len, rec->recordData_buf);
marc_file_write(rec->recordData_buf, rec->recordData_len);
}
printf("%.*s", rec->recordData_len, rec->recordData_buf);
marc_file_write(rec->recordData_buf, rec->recordData_len);
}