projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-init-read-iolog' of https://github.com/aclamk/fio
[fio.git]
/
fifo.c
diff --git
a/fifo.c
b/fifo.c
index de0318414ad45aea2ba11326ccf2405756c9c5b1..ac0d21576dcf9fce5192945472cb7dd04f624bff 100644
(file)
--- a/
fifo.c
+++ b/
fifo.c
@@
-15,7
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139
, USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
*
*/
*
*/
@@
-24,6
+24,7
@@
#include <string.h>
#include "fifo.h"
#include <string.h>
#include "fifo.h"
+#include "minmax.h"
struct fifo *fifo_alloc(unsigned int size)
{
struct fifo *fifo_alloc(unsigned int size)
{
@@
-31,7
+32,7
@@
struct fifo *fifo_alloc(unsigned int size)
fifo = malloc(sizeof(struct fifo));
if (!fifo)
fifo = malloc(sizeof(struct fifo));
if (!fifo)
- return
0
;
+ return
NULL
;
fifo->buffer = malloc(size);
fifo->size = size;
fifo->buffer = malloc(size);
fifo->size = size;