Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Per Cederqvist
lyskom-server-ceder-1616-generations-topgit
Commits
88867200
Commit
88867200
authored
Oct 14, 1993
by
Per Cederqvist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed u_ to unsigned.
Include <sys/types.h>.
parent
20bd48b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
56 additions
and
54 deletions
+56
-54
src/server/ram-output.c
src/server/ram-output.c
+50
-49
src/server/ram-parse.c
src/server/ram-parse.c
+6
-5
No files found.
src/server/ram-output.c
View file @
88867200
/*
* $Id: ram-output.c,v 0.
8
1993/10/14
09:11:22
ceder Exp $
* $Id: ram-output.c,v 0.
9
1993/10/14
22:38:05
ceder Exp $
* Copyright (C) 1991 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
...
...
@@ -33,7 +33,7 @@
* (It worked - now saving is twice as fast.)
*/
static
char
*
rcsid
=
"$Id: ram-output.c,v 0.
8
1993/10/14
09:11:22
ceder Exp $"
;
static
char
*
rcsid
=
"$Id: ram-output.c,v 0.
9
1993/10/14
22:38:05
ceder Exp $"
;
#include "rcs.h"
USE
(
rcsid
);
...
...
@@ -42,6 +42,7 @@ USE(rcsid);
#ifdef HAVE_STDARG_H
# include <stdarg.h>
#endif
#include <sys/types.h>
#include "kom-types.h"
#include "ram-output.h"
...
...
@@ -63,17 +64,17 @@ foutput_person (FILE *fp,
foutput_time
(
fp
,
person
->
last_login
);
fprintf
(
fp
,
" %lu %lu %lu %lu %lu %lu %lu %lu %lu"
,
(
u
_
long
)
person
->
user_area
,
(
u
_
long
)
person
->
total_time_present
,
/* This is not a time,
(
u
nsigned
long
)
person
->
user_area
,
(
u
nsigned
long
)
person
->
total_time_present
,
/* This is not a time,
* but a number of seconds.
*/
(
u
_
long
)
person
->
sessions
,
(
u
_
long
)
person
->
created_lines
,
(
u
_
long
)
person
->
created_bytes
,
(
u
_
long
)
person
->
read_texts
,
(
u
_
long
)
person
->
no_of_text_fetches
,
(
u
_
long
)
person
->
created_persons
,
(
u
_
long
)
person
->
created_confs
);
(
u
nsigned
long
)
person
->
sessions
,
(
u
nsigned
long
)
person
->
created_lines
,
(
u
nsigned
long
)
person
->
created_bytes
,
(
u
nsigned
long
)
person
->
read_texts
,
(
u
nsigned
long
)
person
->
no_of_text_fetches
,
(
u
nsigned
long
)
person
->
created_persons
,
(
u
nsigned
long
)
person
->
created_confs
);
}
...
...
@@ -91,13 +92,13 @@ foutput_conference (FILE *fp,
foutput_time
(
fp
,
conf_c
->
last_written
);
fprintf
(
fp
,
" %lu %lu %lu %lu %lu %lu %lu"
,
(
u
_
long
)
conf_c
->
creator
,
(
u
_
long
)
conf_c
->
presentation
,
(
u
_
long
)
conf_c
->
supervisor
,
(
u
_
long
)
conf_c
->
permitted_submitters
,
(
u
_
long
)
conf_c
->
super_conf
,
(
u
_
long
)
conf_c
->
msg_of_day
,
(
u
_
long
)
conf_c
->
nice
);
(
u
nsigned
long
)
conf_c
->
creator
,
(
u
nsigned
long
)
conf_c
->
presentation
,
(
u
nsigned
long
)
conf_c
->
supervisor
,
(
u
nsigned
long
)
conf_c
->
permitted_submitters
,
(
u
nsigned
long
)
conf_c
->
super_conf
,
(
u
nsigned
long
)
conf_c
->
msg_of_day
,
(
u
nsigned
long
)
conf_c
->
nice
);
}
...
...
@@ -109,12 +110,12 @@ foutput_text_stat(FILE *fp,
foutput_time
(
fp
,
t_stat
->
creation_time
);
foutput_ulong
((
u
_
long
)
t_stat
->
author
,
fp
);
foutput_ulong
((
u
_
long
)
t_stat
->
file_pos
,
fp
);
foutput_ulong
((
u
_
long
)
t_stat
->
no_of_lines
,
fp
);
foutput_ulong
((
u
_
long
)
t_stat
->
no_of_chars
,
fp
);
foutput_ulong
((
u
_
long
)
t_stat
->
no_of_marks
,
fp
);
foutput_ulong
((
u
_
long
)
t_stat
->
no_of_misc
,
fp
);
foutput_ulong
((
u
nsigned
long
)
t_stat
->
author
,
fp
);
foutput_ulong
((
u
nsigned
long
)
t_stat
->
file_pos
,
fp
);
foutput_ulong
((
u
nsigned
long
)
t_stat
->
no_of_lines
,
fp
);
foutput_ulong
((
u
nsigned
long
)
t_stat
->
no_of_chars
,
fp
);
foutput_ulong
((
u
nsigned
long
)
t_stat
->
no_of_marks
,
fp
);
foutput_ulong
((
u
nsigned
long
)
t_stat
->
no_of_misc
,
fp
);
if
(
t_stat
->
misc_items
!=
NULL
&&
t_stat
->
no_of_misc
>
0
)
{
...
...
@@ -132,7 +133,7 @@ extern void
foutput_string
(
FILE
*
fp
,
String
str
)
{
foutput_ulong
((
u
_
long
)
str
.
len
,
fp
);
foutput_ulong
((
u
nsigned
long
)
str
.
len
,
fp
);
putc
(
'H'
,
fp
);
if
(
str
.
len
)
...
...
@@ -184,14 +185,14 @@ foutput_text_list(FILE *fp,
{
int
i
;
foutput_ulong
((
u
_
long
)
text_list
.
first_local_no
,
fp
);
foutput_ulong
((
u
_
long
)
text_list
.
no_of_texts
,
fp
);
foutput_ulong
((
u
nsigned
long
)
text_list
.
first_local_no
,
fp
);
foutput_ulong
((
u
nsigned
long
)
text_list
.
no_of_texts
,
fp
);
if
(
text_list
.
texts
!=
NULL
&&
text_list
.
no_of_texts
>
0
)
{
fputs
(
" {"
,
fp
);
for
(
i
=
0
;
i
<
text_list
.
no_of_texts
;
i
++
)
foutput_ulong
((
u
_
long
)
text_list
.
texts
[
i
],
fp
);
foutput_ulong
((
u
nsigned
long
)
text_list
.
texts
[
i
],
fp
);
fputs
(
" }"
,
fp
);
}
else
...
...
@@ -205,7 +206,7 @@ foutput_mark_list(FILE *fp,
{
int
i
;
fprintf
(
fp
,
" %lu"
,
(
u
_
long
)
mark_list
.
no_of_marks
);
fprintf
(
fp
,
" %lu"
,
(
u
nsigned
long
)
mark_list
.
no_of_marks
);
if
(
mark_list
.
marks
!=
NULL
&&
mark_list
.
no_of_marks
>
0
)
{
...
...
@@ -224,7 +225,7 @@ extern void
foutput_mark
(
FILE
*
fp
,
Mark
mark
)
{
fprintf
(
fp
,
" %lu %lu"
,
(
u
_
long
)
mark
.
text_no
,
(
u
_
long
)
mark
.
mark_type
);
fprintf
(
fp
,
" %lu %lu"
,
(
u
nsigned
long
)
mark
.
text_no
,
(
u
nsigned
long
)
mark
.
mark_type
);
}
void
...
...
@@ -233,7 +234,7 @@ foutput_membership_list (FILE * fp,
{
int
i
;
fprintf
(
fp
,
" %lu"
,
(
u
_
long
)
mlist
.
no_of_confs
);
fprintf
(
fp
,
" %lu"
,
(
u
nsigned
long
)
mlist
.
no_of_confs
);
if
(
mlist
.
confs
!=
NULL
&&
mlist
.
no_of_confs
>
0
)
{
...
...
@@ -265,16 +266,16 @@ foutput_membership(FILE *fp,
}
fprintf
(
fp
,
" %lu %lu %lu %lu"
,
(
u
_
long
)
mship
->
conf_no
,
(
u
_
long
)
mship
->
priority
,
(
u
_
long
)
mship
->
last_text_read
,
(
u
_
long
)
mship
->
no_of_read
);
(
u
nsigned
long
)
mship
->
conf_no
,
(
u
nsigned
long
)
mship
->
priority
,
(
u
nsigned
long
)
mship
->
last_text_read
,
(
u
nsigned
long
)
mship
->
no_of_read
);
if
(
mship
->
read_texts
!=
NULL
&&
mship
->
no_of_read
>
0
)
{
fprintf
(
fp
,
" {"
);
for
(
i
=
0
;
i
<
mship
->
no_of_read
;
i
++
)
fprintf
(
fp
,
" %lu"
,
(
u
_
long
)
mship
->
read_texts
[
i
]);
fprintf
(
fp
,
" %lu"
,
(
u
nsigned
long
)
mship
->
read_texts
[
i
]);
fprintf
(
fp
,
" }"
);
}
...
...
@@ -286,7 +287,7 @@ void
foutput_time
(
FILE
*
fp
,
time_t
clock
)
{
foutput_ulong
((
u
_
long
)
clock
,
fp
);
foutput_ulong
((
u
nsigned
long
)
clock
,
fp
);
}
...
...
@@ -296,7 +297,7 @@ foutput_member_list(FILE *fp,
{
int
i
;
fprintf
(
fp
,
" %lu"
,
(
u
_
long
)
m_list
.
no_of_members
);
fprintf
(
fp
,
" %lu"
,
(
u
nsigned
long
)
m_list
.
no_of_members
);
if
(
m_list
.
members
!=
NULL
&&
m_list
.
no_of_members
>
0
)
{
fprintf
(
fp
,
" {"
);
...
...
@@ -313,7 +314,7 @@ void
foutput_member
(
FILE
*
fp
,
Member
member
)
{
fprintf
(
fp
,
" %lu"
,
(
u
_
long
)
member
.
member
);
fprintf
(
fp
,
" %lu"
,
(
u
nsigned
long
)
member
.
member
);
}
extern
void
...
...
@@ -332,20 +333,20 @@ extern void
foutput_misc_info
(
FILE
*
fp
,
Misc_info
misc
)
{
foutput_ulong
((
u
_
long
)
misc
.
type
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
type
,
fp
);
switch
(
misc
.
type
)
{
case
recpt
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
recipient
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
recipient
,
fp
);
break
;
case
cc_recpt
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
cc_recipient
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
cc_recipient
,
fp
);
break
;
case
loc_no
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
local_no
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
local_no
,
fp
);
break
;
case
rec_time
:
...
...
@@ -353,23 +354,23 @@ foutput_misc_info(FILE *fp,
break
;
case
comm_to
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
comment_to
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
comment_to
,
fp
);
break
;
case
comm_in
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
commented_in
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
commented_in
,
fp
);
break
;
case
footn_to
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
footnote_to
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
footnote_to
,
fp
);
break
;
case
footn_in
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
footnoted_in
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
footnoted_in
,
fp
);
break
;
case
sent_by
:
foutput_ulong
((
u
_
long
)
misc
.
datum
.
sender
,
fp
);
foutput_ulong
((
u
nsigned
long
)
misc
.
datum
.
sender
,
fp
);
break
;
case
sent_at
:
...
...
@@ -390,7 +391,7 @@ foutput_misc_info(FILE *fp,
*/
void
foutput_ulong
(
u
_
long
l
,
foutput_ulong
(
u
nsigned
long
l
,
FILE
*
fp
)
{
static
char
buf
[
20
];
...
...
src/server/ram-parse.c
View file @
88867200
/*
* $Id: ram-parse.c,v 0.1
3
1993/10/14
09:11:27
ceder Exp $
* $Id: ram-parse.c,v 0.1
4
1993/10/14
22:39:15
ceder Exp $
* Copyright (C) 1991 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
...
...
@@ -29,7 +29,7 @@
* ram-parse.c -- parse objects from disk file.
*/
static
char
*
rcsid
=
"$Id: ram-parse.c,v 0.1
3
1993/10/14
09:11:27
ceder Exp $"
;
static
char
*
rcsid
=
"$Id: ram-parse.c,v 0.1
4
1993/10/14
22:39:15
ceder Exp $"
;
#include "rcs.h"
USE
(
rcsid
);
...
...
@@ -42,6 +42,7 @@ USE(rcsid);
#ifdef HAVE_STDARG_H
# include <stdarg.h>
#endif
#include <sys/types.h>
#include "kom-types.h"
#include "ram-parse.h"
...
...
@@ -70,10 +71,10 @@ fskipwhite(FILE *fp)
ungetc
(
c
,
fp
);
}
extern
u
_
long
extern
u
nsigned
long
fparse_long
(
FILE
*
fp
)
{
u
_
long
res
=
0
;
u
nsigned
long
res
=
0
;
int
foo
=
0
;
int
c
;
...
...
@@ -395,7 +396,7 @@ fparse_membership_list(FILE *fp,
}
log
(
"fparse_membership_list(): empty list with %lu "
"elements (corrected).
\n
"
,
(
u
_
long
)
result
->
no_of_confs
);
(
u
nsigned
long
)
result
->
no_of_confs
);
result
->
no_of_confs
=
0
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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