diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-14 22:48:33 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-14 22:48:33 +0000 |
| commit | 536bc2c6525745b914830119c65824faf63e15e8 (patch) | |
| tree | 3df9efc98c9f87d5b938bfd7d71b4580815c88d7 /cups/file.c | |
| parent | 6c663ae27a281db893fee6ccb67d0448eef924d8 (diff) | |
| download | cups-536bc2c6525745b914830119c65824faf63e15e8.tar.gz | |
Merge changes from CUPS 1.4svn-r8639.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1505 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/file.c')
| -rw-r--r-- | cups/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cups/file.c b/cups/file.c index 68e854de3..08445bea4 100644 --- a/cups/file.c +++ b/cups/file.c @@ -755,7 +755,7 @@ cupsFileLock(cups_file_t *fp, /* I - CUPS file */ */ #ifdef WIN32 - return (locking(fp->fd, block ? _LK_LOCK : _LK_NBLCK, 0)); + return (_locking(fp->fd, block ? _LK_LOCK : _LK_NBLCK, 0)); #else return (lockf(fp->fd, block ? F_LOCK : F_TLOCK, 0)); #endif /* WIN32 */ @@ -1078,7 +1078,7 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ bytes = vsnprintf(fp->printf_buffer, fp->printf_size, format, ap); va_end(ap); - if (bytes >= fp->printf_size) + if (bytes >= (ssize_t)fp->printf_size) { /* * Expand the printf buffer... @@ -1762,7 +1762,7 @@ cupsFileUnlock(cups_file_t *fp) /* I - CUPS file */ */ #ifdef WIN32 - return (locking(fp->fd, _LK_UNLCK, 0)); + return (_locking(fp->fd, _LK_UNLCK, 0)); #else return (lockf(fp->fd, F_ULOCK, 0)); #endif /* WIN32 */ |