Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
18f3e536
Commit
18f3e536
authored
Apr 17, 2014
by
Thomas Jahns
🤸
Browse files
Save on wrapper code and calls.
parent
9c15c76a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/institution.c
View file @
18f3e536
...
...
@@ -32,17 +32,17 @@ typedef struct
institute_t
;
static
int
instituteCompare
P
(
void
*
instituteptr1
,
void
*
institute
ptr2
);
static
void
instituteDestroyP
(
void
*
instituteptr
);
static
void
institutePrintP
(
void
*
instituteptr
,
FILE
*
fp
);
static
int
instituteCompare
Kernel
(
institute_t
*
ip1
,
institute
_t
*
ip2
);
static
void
instituteDestroyP
(
institute_t
*
instituteptr
);
static
void
institutePrintP
(
institute_t
*
instituteptr
,
FILE
*
fp
);
static
int
instituteGetSizeP
(
void
*
instituteptr
,
void
*
context
);
static
void
institutePackP
(
void
*
instituteptr
,
void
*
buf
,
int
size
,
int
*
position
,
void
*
context
);
static
int
instituteTxCode
(
void
);
static
const
resOps
instituteOps
=
{
instituteCompare
P
,
instituteDestroyP
,
institutePrintP
,
(
int
(
*
)(
void
*
,
void
*
))
instituteCompare
Kernel
,
(
void
(
*
)(
void
*
))
instituteDestroyP
,
(
void
(
*
)(
void
*
,
FILE
*
))
institutePrintP
,
instituteGetSizeP
,
institutePackP
,
instituteTxCode
...
...
@@ -90,7 +90,8 @@ int instituteCount ( void )
}
int
instituteCompareKernel
(
institute_t
*
ip1
,
institute_t
*
ip2
)
static
int
instituteCompareKernel
(
institute_t
*
ip1
,
institute_t
*
ip2
)
{
int
differ
=
0
;
size_t
len1
,
len2
;
...
...
@@ -129,19 +130,6 @@ int instituteCompareKernel ( institute_t * ip1, institute_t * ip2 )
}
static
int
instituteCompareP
(
void
*
instituteptr1
,
void
*
instituteptr2
)
{
institute_t
*
i1
,
*
i2
;
i1
=
(
institute_t
*
)
instituteptr1
;
i2
=
(
institute_t
*
)
instituteptr2
;
xassert
(
i1
);
xassert
(
i2
);
return
instituteCompareKernel
(
i1
,
i2
);
}
struct
instLoc
{
institute_t
*
ip
;
...
...
@@ -273,37 +261,34 @@ int institutInqNumber(void)
}
void
instituteDestroyP
(
void
*
instituteptr
)
static
void
instituteDestroyP
(
institute_t
*
instituteptr
)
{
int
id
;
institute_t
*
i1
=
(
institute_t
*
)
instituteptr
;
xassert
(
i1
);
id
=
i1
->
self
;
xassert
(
instituteptr
);
free
(
i1
->
name
);
free
(
i1
->
longname
);
reshRemove
(
id
,
&
instituteOps
);
int
instituteID
=
instituteptr
->
self
;
free
(
instituteptr
->
name
);
free
(
instituteptr
->
longname
);
reshRemove
(
instituteID
,
&
instituteOps
);
free
(
instituteptr
);
}
void
institutePrintP
(
void
*
institute
ptr
,
FILE
*
fp
)
static
void
institutePrintP
(
institute
_t
*
ip
,
FILE
*
fp
)
{
i
nstitute_t
*
ip
=
(
institute_t
*
)
instituteptr
;
if
(
!
ip
)
return
;
fprintf
(
fp
,
"#
\n
"
);
fprintf
(
fp
,
"# instituteID %d
\n
"
,
ip
->
self
);
fprintf
(
fp
,
"#
\n
"
);
fprintf
(
fp
,
"self = %d
\n
"
,
ip
->
self
);
fprintf
(
fp
,
"used
= %
d
\n
"
,
ip
->
used
);
fprintf
(
fp
,
"center
= %
d
\n
"
,
ip
->
center
);
fprintf
(
fp
,
"subcenter = %d
\n
"
,
ip
->
subcenter
);
fprintf
(
fp
,
"name = %s
\n
"
,
ip
->
name
?
ip
->
name
:
"NN"
);
fprintf
(
fp
,
"longname = %s
\n
"
,
ip
->
longname
?
ip
->
longname
:
"NN"
);
i
f
(
ip
)
fprintf
(
fp
,
"#
\n
"
"# instituteID %d
\n
"
"#
\n
"
"self = %d
\n
"
"used = %d
\n
"
"center = %d
\n
"
"subcenter = %d
\n
"
"name
= %
s
\n
"
"longname
= %
s
\n
"
,
ip
->
self
,
ip
->
self
,
ip
->
used
,
ip
->
center
,
ip
->
subcenter
,
ip
->
name
?
ip
->
name
:
"NN"
,
ip
->
longname
?
ip
->
longname
:
"NN"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment