Permalink
Browse files

Removed GPL exception, the Simplified BSD License text is enough

  • Loading branch information...
1 parent 6a5e985 commit 5b0ddd26075416b113e73291fb7ed0f389810ccd @amery amery committed May 22, 2012
View
13 LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011, Alejandro Mery <amery@geeks.cl>
+Copyright (c) 2011 - 2012, Alejandro Mery <amery@geeks.cl>
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -24,14 +24,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Alternatively, the contents of this package may be used under the terms
-of the GNU General Public License ("GPL") version 2 or any later version,
-in which case the provisions of the GPL are applicable instead of the
-above. If you wish to allow the use of your version of this package only
-under the terms of the GPL and not to allow others to use your version of
-this file under the BSD license, indicate your decision by deleting the
-provisions above and replace them with the notice and other provisions
-required by the GPL in this and the other files of this package. If you do
-not delete the provisions above, a recipient may use your version of this
-file under either the BSD or the GPL.
View
10 README
@@ -5,13 +5,13 @@ A C Framework for lightweight mini network servers
sancus-core aims to easy to creation of light mini networked servers
using Marc Lehmann's libev[1] and licensed under the terms described
-in the LICENSE file (tl;dr BSD or GPL just as libev itself).
+in the LICENSE file (tl;dr BSD).
[1] http://software.schmorp.de/pkg/libev.html
-## APIs
+= APIs =
-### Low Level API ==
+== Low Level API ==
The Low Level API mostly wraps POSIX functions and provides basic data
structures.
@@ -20,8 +20,8 @@ structures.
* sancus_fd.h
* sancus_socket.h
-### Mid Level API ==
+== Mid Level API ==
* sancus_tcp_server.h
-### High Level API ==
+== High Level API ==
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_ALLOC_H
#define _SANCUS_ALLOC_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_BUFFER_H
#define _SANCUS_BUFFER_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_COMMON_H
#define _SANCUS_COMMON_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_FD_H
#define _SANCUS_FD_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_FMT_H
#define _SANCUS_FMT_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_LIST_H
#define _SANCUS_LIST_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_LOG_H
#define _SANCUS_LOG_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_SOCKET_H
#define _SANCUS_SOCKET_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_STREAM_H
#define _SANCUS_STREAM_H
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#ifndef _SANCUS_TCP_SERVER_H
#define _SANCUS_TCP_SERVER_H
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#include <stdlib.h>
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#include <assert.h>
#include <errno.h>
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#include <assert.h>
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#include <assert.h>
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#include <assert.h>
@@ -129,24 +118,24 @@ ssize_t sancus_stream_process(struct sancus_stream *self)
void sancus_stream_start(struct sancus_stream *self, struct ev_loop *loop)
{
assert(!ev_is_active(&self->read_watcher));
+
ev_io_start(loop, &self->read_watcher);
}
void sancus_stream_stop(struct sancus_stream *self, struct ev_loop *loop)
{
assert(ev_is_active(&self->read_watcher));
+
ev_io_stop(loop, &self->read_watcher);
}
void sancus_stream_close(struct sancus_stream *self)
{
assert(self->read_watcher.fd >= 0);
-
assert(!ev_is_active(&self->read_watcher));
sancus_close(&self->read_watcher.fd);
-
self->settings->on_close(self);
}
View
@@ -25,17 +25,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this package may be used under the terms
- * of the GNU General Public License ("GPL") version 2 or any later version,
- * in which case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this package only
- * under the terms of the GPL and not to allow others to use your version of
- * this file under the BSD license, indicate your decision by deleting the
- * provisions above and replace them with the notice and other provisions
- * required by the GPL in this and the other files of this package. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the BSD or the GPL.
*/
#include <assert.h>
#include <stdbool.h>

0 comments on commit 5b0ddd2

Please sign in to comment.