oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

io/FileDescriptor: use std::size_t

Browse Source
This commit is contained in:
Max Kellermann 2020-11-30 22:26:56 +01:00
parent b47e0cffdd
commit d547ace749
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/io/FileDescriptor.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 Max Kellermann <max.kellermann@gmail.com> * Copyright 2012-2020 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -32,6 +32,7 @@
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
#include <stdexcept>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@ -289,7 +290,7 @@ FileDescriptor::GetSize() const noexcept
} }
void void
FileDescriptor::FullRead(void *_buffer, size_t length) FileDescriptor::FullRead(void *_buffer, std::size_t length)
{ {
auto buffer = (uint8_t *)_buffer; auto buffer = (uint8_t *)_buffer;
@ -307,7 +308,7 @@ FileDescriptor::FullRead(void *_buffer, size_t length)
} }
void void
FileDescriptor::FullWrite(const void *_buffer, size_t length) FileDescriptor::FullWrite(const void *_buffer, std::size_t length)
{ {
auto buffer = (const uint8_t *)_buffer; auto buffer = (const uint8_t *)_buffer;

9
src/io/FileDescriptor.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 Max Kellermann <max.kellermann@gmail.com> * Copyright 2012-2020 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -32,6 +32,7 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#include <cstddef>
#include <utility> #include <utility>
#include <unistd.h> #include <unistd.h>
@ -229,7 +230,7 @@ public:
gcc_pure gcc_pure
off_t GetSize() const noexcept; off_t GetSize() const noexcept;
ssize_t Read(void *buffer, size_t length) noexcept { ssize_t Read(void *buffer, std::size_t length) noexcept {
return ::read(fd, buffer, length); return ::read(fd, buffer, length);
} }
@ -237,9 +238,9 @@ public:
* Read until all of the given buffer has been filled. Throws * Read until all of the given buffer has been filled. Throws
* on error. * on error.
*/ */
void FullRead(void *buffer, size_t length); void FullRead(void *buffer, std::size_t length);
ssize_t Write(const void *buffer, size_t length) noexcept { ssize_t Write(const void *buffer, std::size_t length) noexcept {
return ::write(fd, buffer, length); return ::write(fd, buffer, length);
} }