httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/fs lock.c
Date Sun, 12 Sep 2004 22:14:57 GMT
jorton      2004/09/12 15:14:57

  Modified:    modules/dav/fs lock.c
  Log:
  * modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record
  handling on 64-bit platforms: use correct size of apr_datum_t.dsize
  field.
  
  Revision  Changes    Path
  1.32      +2 -2      httpd-2.0/modules/dav/fs/lock.c
  
  Index: lock.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/lock.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -d -w -u -r1.31 -r1.32
  --- lock.c	19 Mar 2004 02:32:25 -0000	1.31
  +++ lock.c	12 Sep 2004 22:14:57 -0000	1.32
  @@ -66,7 +66,7 @@
   **    INDIRECT LOCK:   [char      (DAV_LOCK_INDIRECT),
   **			apr_uuid_t locktoken,
   **			time_t     expires,
  -**			int        key_size,
  +**			apr_size_t key_size,
   **			char[]     key]
   **       The key is to the collection lock that resulted in this indirect lock
   */
  @@ -157,7 +157,7 @@
   /* Stored indirect lock info - lock token and apr_datum_t */
   #define dav_size_indirect(a)	(1 + sizeof(apr_uuid_t) \
   				 + sizeof(time_t) \
  -				 + sizeof(int) + (a)->key.dsize)
  +				 + sizeof((a)->key.dsize) + (a)->key.dsize)
   
   /*
   ** The lockdb structure.
  
  
  

Mime
View raw message