Skip to content

Commit

Permalink
Merge branch 'release-v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
MaJerle committed Nov 9, 2019
2 parents 90469d6 + db79129 commit 2671ce2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/src/_mainpage.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*
* \section sect_resources Download & Resources
*
* - <a class="download_url" href="https://github.com/MaJerle/ringbuff/releases">Download library from Github releases</a>
* - <a href="https://github.com/MaJerle/ringbuff_res">Resources and examples repository</a>
* - <a class="download_url" href="https://github.com/MaJerle/ringbuff/releases">Download library at Github releases</a>
* - <a href="https://github.com/MaJerle/ringbuff">Resources and examples repository</a>
* - Read \ref page_appnote before you start development
* - <a href="https://github.com/MaJerle/ringbuff">Official development repository on Github</a>
*
Expand Down
4 changes: 2 additions & 2 deletions ringbuff/src/include/ringbuff/ringbuff.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/*
* Copyright (c) 2019 Tilen Majerle
* Copyright (c) 2019 Tilen MAJERLE
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -29,7 +29,7 @@
* This file is part of ring buffer library.
*
* Author: Tilen MAJERLE <[email protected]>
* Version: v1.1
* Version: v1.1.0
*/
#ifndef RINGBUFF_HDR_H
#define RINGBUFF_HDR_H
Expand Down
6 changes: 3 additions & 3 deletions ringbuff/src/ringbuff/ringbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/*
* Copyright (c) 2019 Tilen Majerle
* Copyright (c) 2019 Tilen MAJERLE
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -29,7 +29,7 @@
* This file is part of ring buffer library.
*
* Author: Tilen MAJERLE <[email protected]>
* Version: v1.1
* Version: v1.1.0
*/
#include "ringbuff/ringbuff.h"

Expand Down Expand Up @@ -388,7 +388,7 @@ BUF_PREF(buff_get_linear_block_write_length)(BUF_PREF(buff_t)* buff) {
* - If r is not 0, statement does not get called
* - buff->size cannot be 0 and if r is 0, len is greater 0
*/
len--;
--len;
}
} else {
len = r - w - 1;
Expand Down

0 comments on commit 2671ce2

Please sign in to comment.