Changeset c739102 in mainline for uspace/srv

Timestamp:

2012-11-21T23:26:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0f2c80a

Parents:

bebf97d (diff), 1f7753a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

Location:

uspace/srv

Files:

• fs/ext2fs/Makefile (deleted)
• fs/ext2fs/ext2fs_ops.c (deleted)
• fs/ext4fs/ext4fs_ops.c (modified) (1 diff)
• logger/initlvl.c (modified) (2 diffs)

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2011 Martin Sucha
  * Copyright (c) 2012 Frantisek Princ
  * All rights reserved.

uspace/srv/logger/initlvl.c

@@ -38 +38 @@
 #include <sysinfo.h>
 #include <str.h>
+#include <stdlib.h>
 #include "logger.h"
 
@@ -91 +92 @@
         char level_str[200];
         str_cpy(level_str, 200, (const char *) argument);
+        free(argument);
 
         parse_level_settings(level_str);