Remove ucore_ prefix from headers and source files

test/backtrace.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <ucore/ucore_backtrace.h>
+#include <ucore/backtrace.h>
 
 //note , compiling this without -rdynamic does not
 //translate addresses to function names. Use the addr2line in that case

test/logging.c

@@ -1,5 +1,5 @@
-#include <ucore/ucore_logging.h>
-#include <ucore/ucore_utils.h>
+#include <ucore/logging.h>
+#include <ucore/utils.h>
 #include <syslog.h>
 enum {
     MAIN,

test/phi.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "ucore_math.h"
+#include <ucore/math.h>
 
 int main(int argc, char *argv[])
 {

test/salloc_vg.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include <ucore/ucore_salloc.h>
+#include <ucore/salloc.h>
 
 // Intended to be run under valgrind. Should show no errors
 

test/seq.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <ucore/ucore_seq.h>
+#include <ucore/seq.h>
 
 
 void check_before(uint32_t a, uint32_t b)

test/test_bcd.c

@@ -1,5 +1,5 @@
 #include <check.h>
-#include <ucore/ucore_string.h>
+#include <ucore/string.h>
 
 
 START_TEST (test_2bcd_1234567890)

test/test_bitvec.c

@@ -1,5 +1,5 @@
 #include <check.h>
-#include <ucore/ucore_bitvec.h>
+#include <ucore/bitvec.h>
 
 
 START_TEST (test_bitvec_1)

test/test_buffer.c

@@ -1,6 +1,6 @@
 #include <check.h>
 #include <string.h>
-#include <ucore/ucore_buffer.h>
+#include <ucore/buffer.h>
 
 
 START_TEST (test_new_gbuf)

test/test_clock.c

@@ -1,6 +1,6 @@
 #include <check.h>
 #include <unistd.h>
-#include <ucore/ucore_clock.h>
+#include <ucore/clock.h>
 
 
 START_TEST (test_settable_clock)
@@ -8,14 +8,14 @@ START_TEST (test_settable_clock)
     struct timeval tv;
     struct timeval tv_tmp;
 
-    ucore_settable_clock_init(&my_clock);
+    uc_settable_clock_init(&my_clock);
 
     my_clock.clock.now(&my_clock.clock, &tv);
 
     fail_if(tv.tv_sec != 0);
     fail_if(tv.tv_usec != 0);
 
-    ucore_settable_clock_set(&my_clock, 10001, 1002);
+    uc_settable_clock_set(&my_clock, 10001, 1002);
 
     my_clock.clock.now(&my_clock.clock, &tv);
 
@@ -27,7 +27,7 @@ START_TEST (test_settable_clock)
     tv_tmp.tv_sec = 123456789;
     tv_tmp.tv_usec = 44;
 
-    ucore_settable_clock_set_tv(&my_clock, &tv_tmp);
+    uc_settable_clock_set_tv(&my_clock, &tv_tmp);
 
     my_clock.clock.now(&my_clock.clock, &tv);
 
@@ -40,7 +40,7 @@ START_TEST (test_cached_clock)
     struct UCoreCachedClock my_clock;
     struct timeval tv1,tv2;
 
-    ucore_cached_clock_init(&my_clock, &ucore_timeofday_clock);
+    uc_cached_clock_init(&my_clock, &uc_timeofday_clock);
 
     my_clock.clock.now(&my_clock.clock, &tv1);
 
@@ -54,7 +54,7 @@ START_TEST (test_cached_clock)
     fail_if(timercmp(&tv1, &tv2, !=));
 
     usleep(100);
-    ucore_cached_clock_update(&my_clock);
+    uc_cached_clock_update(&my_clock);
     my_clock.clock.now(&my_clock.clock, &tv1);
 
     fail_if(!timercmp(&tv1, &tv2, !=));

test/test_containerof.c

@@ -1,5 +1,5 @@
 #include <check.h>
-#include <ucore/ucore_utils.h>
+#include <ucore/utils.h>
 
 
 struct Inner {

test/test_hex.c

@@ -1,6 +1,6 @@
 #include <check.h>
 #include <string.h>
-#include <ucore/ucore_string.h>
+#include <ucore/string.h>
 
 
 START_TEST (test_uc_hex_encode_1)

test/test_logging.c

@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <ucore/ucore_logging.h>
+#include <ucore/logging.h>
 
 #define FILE_NAME "logfile_test.log"
 #define SUBDIR "log_subdir"

test/test_pack.c

@@ -1,5 +1,5 @@
 #include <check.h>
-#include <ucore/ucore_pack.h>
+#include <ucore/pack.h>
 
 
 START_TEST (test_pack16_le_1)

test/test_read_file.c

@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <ucore/ucore_read_file.h>
+#include <ucore/read_file.h>
 
 
 START_TEST (test_read_file_non_existing_file)

test/test_threadqueue.c

@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <sched.h>
 #include <stdlib.h>
-#include <ucore/ucore_threadqueue.h>
+#include <ucore/threadqueue.h>
 
 struct thr_msg {
     struct uc_threadmsg msg;

test/threadqueue.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucore/ucore_threadqueue.h>
+#include <ucore/threadqueue.h>
 
 struct uc_threadqueue queue;
 

test/threadqueue_signal.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
-#include <ucore/ucore_threadqueue.h>
+#include <ucore/threadqueue.h>
 
 struct uc_threadqueue queue;
 

test/timers.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <ucore/ucore_timers.h>
-#include <ucore/ucore_utils.h>
+#include <ucore/timers.h>
+#include <ucore/utils.h>
 
 
 struct MyStruct {

test/udp_heartbeat.c

@@ -12,11 +12,11 @@
 #include <sys/queue.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <ucore/ucore_logging.h>
-#include <ucore/ucore_logging.h>
+#include <ucore/logging.h>
+#include <ucore/logging.h>
 #include <ucore/iomux.h>
-#include <ucore/ucore_utils.h>
-#include <ucore/ucore_pack.h>
+#include <ucore/utils.h>
+#include <ucore/pack.h>
 
 #define HB_MAGIX 0xBEA7BEA7