Changeset 04803bf in mainline for uspace/app/bdsh/errors.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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:

Merge mainline changes (needs fixes).

File:

• uspace/app/bdsh/errors.c (modified) (2 diffs)

uspace/app/bdsh/errors.c

@@ -30 +30 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -47 +47 @@
 /* Look up errno in cl_errors and return the corresponding string.
  * Return NULL if not found */
-static char *err2str(int err)
+static const char *err2str(int err)
 {