Changeset c621f4aa in mainline for uspace/app/klog

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

Location:

uspace/app/klog

Files:

• Makefile (modified) (1 diff)
• klog.c (modified) (3 diffs)

uspace/app/klog/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = klog
+BINARY = klog
 
 SOURCES = \
         klog.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common

uspace/app/klog/klog.c

@@ -64 +64 @@
 int main(int argc, char *argv[])
 {
-        size_t klog_pages = sysinfo_value("klog.pages");
+        size_t klog_pages;
+        if (sysinfo_get_value("klog.pages", &klog_pages) != EOK) {
+                printf("%s: Error getting klog address\n", NAME);
+                return -1;
+        }
+        
         size_t klog_size = klog_pages * PAGE_SIZE;
         klog_length = klog_size / sizeof(wchar_t);
@@ -70 +75 @@
         klog = (wchar_t *) as_get_mappable_page(klog_size);
         if (klog == NULL) {
-                printf(NAME ": Error allocating memory area\n");
+                printf("%s: Error allocating memory area\n", NAME);
                 return -1;
         }
@@ -77 +82 @@
             klog_size, SERVICE_MEM_KLOG);
         if (res != EOK) {
-                printf(NAME ": Error initializing memory area\n");
+                printf("%s: Error initializing memory area\n", NAME);
                 return -1;
         }
         
         if (event_subscribe(EVENT_KLOG, 0) != EOK) {
-                printf(NAME ": Error registering klog notifications\n");
+                printf("%s: Error registering klog notifications\n", NAME);
                 return -1;
         }