summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h5
-rw-r--r--source3/include/smb.h9
2 files changed, 6 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index faddbc6a49..60b8eed59a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -636,7 +636,7 @@ BOOL check_file_sharing(int cnum,char *fname);
void open_file_shared(int fnum,int cnum,char *fname,int share_mode,int ofun,
int mode,int *Access,int *action);
int seek_file(int fnum,int pos);
-int read_file(int fnum,char *data,int pos,int mincnt,int maxcnt,int timeout,BOOL exact);
+int read_file(int fnum,char *data,int pos,int n);
int write_file(int fnum,char *data,int n);
BOOL become_service(int cnum,BOOL do_chdir);
int find_service(char *service);
@@ -819,8 +819,7 @@ void make_dir_struct(char *buf,char *mask,char *fname,unsigned int size,int mode
void close_low_fds(void);
int write_socket(int fd,char *buf,int len);
int read_udp_socket(int fd,char *buf,int len);
-int set_blocking(int fd, BOOL set);
-int read_with_timeout(int fd,char *buf,int mincnt,int maxcnt,long time_out,BOOL exact);
+int read_with_timeout(int fd,char *buf,int mincnt,int maxcnt,long time_out);
int read_max_udp(int fd,char *buffer,int bufsize,int maxtime);
int TvalDiff(struct timeval *tvalold,struct timeval *tvalnew);
BOOL send_keepalive(int client);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 05924de35e..317f31b19e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -111,11 +111,10 @@ EXTERN int syslog_level;
#define DEBUG(level,body) ((DEBUGLEVEL>=(level))? (syslog_level = (level), Debug1 body):0)
#endif
-/* this defines the error codes that receive_smb can put in smberrcode */
-#define SMBERR_OK 0
-#define SMBERR_TIMEOUT 1
-#define SMBERR_EOF 2
-#define SMBERR_ERROR 3
+/* this defines the error codes that receive_smb can put in smb_read_error */
+#define READ_TIMEOUT 1
+#define READ_EOF 2
+#define READ_ERROR 3
#define DIR_STRUCT_SIZE 43