From: Dunceor (dunceorgmail.com)
Date: Tue Apr 11 2006 - 14:33:36 CDT

• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

A diff to clean up a comparision of a signed and unsigned and I decided that
reqid is a unsigned number so I changed all to unsigned (u_int32_t, maybe
should be a smaller unsigned?).

Thanks.

Diff follows.

Index: cvs.h
===================================================================
RCS file: /cvs/src/usr.bin/cvs/cvs.h,v
retrieving revision 1.103
diff -u -r1.103 cvs.h
--- cvs.h 1 Apr 2006 20:11:25 -0000 1.103
+++ cvs.h 11 Apr 2006 17:50:48 -0000
-367,7 +367,7

 struct cvs_cmd *cvs_findcmd(const char *);
-struct cvs_cmd *cvs_findcmdbyreq(int);
+struct cvs_cmd *cvs_findcmdbyreq(u_int32_t);
 int cvs_startcmd(struct cvs_cmd *, int, char **);
 int cvs_server(int, char **);

Index: proto.h
===================================================================
RCS file: /cvs/src/usr.bin/cvs/proto.h,v
retrieving revision 1.12
diff -u -r1.12 proto.h
--- proto.h 4 Jan 2006 14:58:12 -0000 1.12
+++ proto.h 11 Apr 2006 17:50:51 -0000
-153,8 +153,8
 #define CVS_RESP_MAX 32

 struct cvs_req {
- int req_id;
- char req_str[32];
+ u_int32_t req_id;
+ char req_str[32];
     u_int req_flags;
 };

-170,7 +170,7
 void cvs_disconnect(struct cvsroot *);
 int cvs_req_handle(char *);
-struct cvs_req *cvs_req_getbyid(int);
+struct cvs_req *cvs_req_getbyid(u_int32_t);
 struct cvs_req *cvs_req_getbyname(const char *);
 char *cvs_req_getvalid(void);

Index: proto.c
===================================================================
RCS file: /cvs/src/usr.bin/cvs/proto.c,v
retrieving revision 1.95
diff -u -r1.95 proto.c
--- proto.c 11 Apr 2006 07:52:34 -0000 1.95
+++ proto.c 11 Apr 2006 17:50:56 -0000
-347,7 +347,7
  *
  */
 struct cvs_req*
-cvs_req_getbyid(int reqid)
+cvs_req_getbyid(u_int32_t reqid)
 {
     u_int i;

Index: cmd.c
===================================================================
RCS file: /cvs/src/usr.bin/cvs/cmd.c,v
retrieving revision 1.42
diff -u -r1.42 cmd.c
--- cmd.c 2 Jan 2006 08:11:56 -0000 1.42
+++ cmd.c 11 Apr 2006 17:51:01 -0000
-118,7 +118,7
 }

 struct cvs_cmd *
-cvs_findcmdbyreq(int reqid)
+cvs_findcmdbyreq(u_int32_t reqid)
 {
     int i;
     struct cvs_cmd *cmdp;
Index: req.c
===================================================================
RCS file: /cvs/src/usr.bin/cvs/req.c,v
retrieving revision 1.43
diff -u -r1.43 req.c
--- req.c 28 Mar 2006 07:17:17 -0000 1.43
+++ req.c 11 Apr 2006 17:51:01 -0000
-40,26 +40,26
 extern int cvs_readonly;

-static int cvs_req_set(int, char *);
-static int cvs_req_noop(int, char *);
-static int cvs_req_root(int, char *);
-static int cvs_req_validreq(int, char *);
-static int cvs_req_validresp(int, char *);
-static int cvs_req_expandmod(int, char *);
-static int cvs_req_directory(int, char *);
-static int cvs_req_useunchanged(int, char *);
-static int cvs_req_case(int, char *);
-static int cvs_req_argument(int, char *);
-static int cvs_req_globalopt(int, char *);
-static int cvs_req_gzipstream(int, char *);
-static int cvs_req_entry(int, char *);
-static int cvs_req_filestate(int, char *);
+static int cvs_req_set(u_int32_t, char *);
+static int cvs_req_noop(u_int32_t, char *);
+static int cvs_req_root(u_int32_t, char *);
+static int cvs_req_validreq(u_int32_t, char *);
+static int cvs_req_validresp(u_int32_t, char *);
+static int cvs_req_expandmod(u_int32_t, char *);
+static int cvs_req_directory(u_int32_t, char *);
+static int cvs_req_useunchanged(u_int32_t, char *);
+static int cvs_req_case(u_int32_t, char *);
+static int cvs_req_argument(u_int32_t, char *);
+static int cvs_req_globalopt(u_int32_t, char *);
+static int cvs_req_gzipstream(u_int32_t, char *);
+static int cvs_req_entry(u_int32_t, char *);
+static int cvs_req_filestate(u_int32_t, char *);

-static int cvs_req_command(int, char *);
+static int cvs_req_command(u_int32_t, char *);

 struct cvs_reqhdlr {
- int (*hdlr)(int, char *);
+ int (*hdlr)(u_int32_t, char *);
 } cvs_req_swtab[CVS_REQ_MAX + 1] = {
     { NULL },
     { cvs_req_root },
-180,7 +180,7
  * cvs_req_noop()
  */
 static int
-cvs_req_noop(int reqid, char *line)
+cvs_req_noop(u_int32_t reqid, char *line)
 {
     cvs_sendresp(CVS_RESP_OK, NULL);
     return (0);
-188,7 +188,7

 static int
-cvs_req_root(int reqid, char *line)
+cvs_req_root(u_int32_t reqid, char *line)
 {
     if (cvs_req_rootpath != NULL) {
          cvs_log(LP_ERR, "duplicate Root request received");
-204,7 +204,7

 static int
-cvs_req_validreq(int reqid, char *line)
+cvs_req_validreq(u_int32_t reqid, char *line)
 {
     char *vreq;

-219,7 +219,7
 }

 static int
-cvs_req_validresp(int reqid, char *line)
+cvs_req_validresp(u_int32_t reqid, char *line)
 {
     char *sp, *ep;
     struct cvs_resp *resp;
-242,7 +242,7
 }

 static int
-cvs_req_directory(int reqid, char *line)
+cvs_req_directory(u_int32_t reqid, char *line)
 {
     int pwd;
     size_t dirlen;
-336,7 +336,7
 }

 static int
-cvs_req_entry(int reqid, char *line)
+cvs_req_entry(u_int32_t reqid, char *line)
 {
     struct cvs_ent *ent;

-362,7 +362,7
  * client.
  */
 static int
-cvs_req_filestate(int reqid, char *line)
+cvs_req_filestate(u_int32_t reqid, char *line)
 {
     int ret;
     mode_t fmode;
-414,7 +414,7
  *
  */
 static int
-cvs_req_expandmod(int reqid, char *line)
+cvs_req_expandmod(u_int32_t reqid, char *line)
 {
     cvs_sendresp(CVS_RESP_OK, NULL);
     return (0);
-429,7 +429,7
  * sent by the client, though it gives no clue regarding its use.
  */
 static int
-cvs_req_useunchanged(int reqid, char *line)
+cvs_req_useunchanged(u_int32_t reqid, char *line)
 {
     return (0);
 }
-441,7 +441,7
  * Handler for the `Case' requests, which toggles case sensitivity ON or
OFF
  */
 static int
-cvs_req_case(int reqid, char *line)
+cvs_req_case(u_int32_t reqid, char *line)
 {
     cvs_nocase = 1;
     return (0);
-449,7 +449,7

 static int
-cvs_req_set(int reqid, char *line)
+cvs_req_set(u_int32_t reqid, char *line)
 {
     char *cp, *lp;

-471,7 +471,7

 static int
-cvs_req_argument(int reqid, char *line)
+cvs_req_argument(u_int32_t reqid, char *line)
 {
     char *nap;

-498,7 +498,7

 static int
-cvs_req_globalopt(int reqid, char *line)
+cvs_req_globalopt(u_int32_t reqid, char *line)
 {
     if ((*line != '-') || (*(line + 2) != '\0'))
          fatal("invalid `Global_option' request format");
-540,7 +540,7
  * all further connection data should be compressed.
  */
 static int
-cvs_req_gzipstream(int reqid, char *line)
+cvs_req_gzipstream(u_int32_t reqid, char *line)
 {
     char *ep;
     long val;
-563,7 +563,7
  * Generic request handler for CVS command requests (i.e. diff, update,
tag).
  */
 static int
-cvs_req_command(int reqid, char *line)
+cvs_req_command(u_int32_t reqid, char *line)
 {
     struct cvs_cmd *cmdp;

• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]