Skip to content

Commit 997616a

Browse files
gettlergettler
committed
Misc rearranging of the include files.
1 parent 56fa3b2 commit 997616a

31 files changed

+880
-73
lines changed

‎COPYING

+340
Large diffs are not rendered by default.

‎include/cmyth.h ‎include/cmyth/cmyth.h

File renamed without changes.

‎include/mvp_debug.h ‎include/cmyth/debug.h

File renamed without changes.

‎include/mvp_atomic.h ‎include/refmem/atomic.h

File renamed without changes.

‎include/mvp_refmem.h ‎include/refmem/refmem.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund, Jon Gettler
2+
* Copyright (C) 2004-2009, Eric Lund, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
2424
#ifndef __REFMEM_H
2525
#define __REFMEM_H
2626

27-
#include <mvp_atomic.h>
27+
#include <refmem/atomic.h>
2828

2929
/*
3030
* -----------------------------------------------------------------

‎libcmyth/bookmark.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2005-2006, Jon Gettler
2+
* Copyright (C) 2005-2009, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -21,8 +21,6 @@
2121
#include <stdlib.h>
2222
#include <string.h>
2323
#include <errno.h>
24-
#include <mvp_refmem.h>
25-
#include <cmyth.h>
2624
#include <cmyth_local.h>
2725

2826

‎libcmyth/cmyth_local.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund, Jon Gettler
2+
* Copyright (C) 2004-2009, Eric Lund, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -26,7 +26,8 @@
2626
#define __CMYTH_LOCAL_H
2727

2828
#include <unistd.h>
29-
#include <cmyth.h>
29+
#include <refmem/refmem.h>
30+
#include <cmyth/cmyth.h>
3031
#include <time.h>
3132
#include <pthread.h>
3233
#if defined(HAS_MYSQL)

‎libcmyth/commbreak.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2005-2006, Jon Gettler
2+
* Copyright (C) 2005-2009, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -21,8 +21,6 @@
2121
#include <stdlib.h>
2222
#include <string.h>
2323
#include <errno.h>
24-
#include <mvp_refmem.h>
25-
#include <cmyth.h>
2624
#include <cmyth_local.h>
2725

2826
static void

‎libcmyth/connection.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund, Jon Gettler
2+
* Copyright (C) 2004-2009, Eric Lund, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -33,8 +33,6 @@
3333
#include <errno.h>
3434
#include <string.h>
3535
#include <signal.h>
36-
#include <mvp_refmem.h>
37-
#include <cmyth.h>
3836
#include <cmyth_local.h>
3937

4038
pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;

‎libcmyth/debug.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -23,10 +23,8 @@
2323
*/
2424

2525
#include <stdlib.h>
26-
#include <mvp_refmem.h>
27-
#include <cmyth.h>
2826
#include <cmyth_local.h>
29-
#include <mvp_debug.h>
27+
#include <cmyth/debug.h>
3028

3129
static mvp_debug_ctx_t cmyth_debug_ctx = MVP_DEBUG_CTX_INIT("cmyth",
3230
CMYTH_DBG_NONE,

‎libcmyth/event.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2005-2006, Jon Gettler
2+
* Copyright (C) 2005-2009, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -21,8 +21,6 @@
2121
#include <stdlib.h>
2222
#include <string.h>
2323
#include <errno.h>
24-
#include <mvp_refmem.h>
25-
#include <cmyth.h>
2624
#include <cmyth_local.h>
2725

2826
cmyth_event_t

‎libcmyth/file.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -20,9 +20,7 @@
2020
#include <stdio.h>
2121
#include <stdlib.h>
2222
#include <errno.h>
23-
#include <mvp_refmem.h>
2423
#include <sys/socket.h>
25-
#include <cmyth.h>
2624
#include <cmyth_local.h>
2725

2826
/*

‎libcmyth/freespace.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -25,8 +25,6 @@
2525
#include <unistd.h>
2626
#include <stdio.h>
2727
#include <errno.h>
28-
#include <mvp_refmem.h>
29-
#include <cmyth.h>
3028
#include <cmyth_local.h>
3129

3230
/*

‎libcmyth/keyframe.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -26,8 +26,6 @@
2626
#include <unistd.h>
2727
#include <string.h>
2828
#include <stdio.h>
29-
#include <mvp_refmem.h>
30-
#include <cmyth.h>
3129
#include <cmyth_local.h>
3230

3331
/*

‎libcmyth/livetv.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2006, Sergio Slobodrian
2+
* Copyright (C) 2006-2009, Sergio Slobodrian
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -31,8 +31,6 @@
3131
#include <stdio.h>
3232
#include <errno.h>
3333
#include <string.h>
34-
#include <mvp_refmem.h>
35-
#include <cmyth.h>
3634
#include <cmyth_local.h>
3735
#include <string.h>
3836

‎libcmyth/mysql_query.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2006, Simon Hyde
2+
* Copyright (C) 2006-2009, Simon Hyde
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -20,8 +20,6 @@
2020
#include <sys/types.h>
2121
#include <string.h>
2222
#include <stdio.h>
23-
#include <mvp_refmem.h>
24-
#include <cmyth.h>
2523
#include <cmyth_local.h>
2624

2725
#define CMYTH_ULONG_STRLEN ((sizeof(long)*3)+1)

‎libcmyth/mythtv_mysql.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -25,10 +25,8 @@
2525
#include <string.h>
2626
#include <sys/time.h>
2727
#include <mysql/mysql.h>
28-
#include <mvp_refmem.h>
29-
#include <cmyth.h>
3028
#include <cmyth_local.h>
31-
#include <mvp_string.h>
29+
#include <safe_string.h>
3230

3331
#if 0
3432
#define PRINTF(x...) PRINTF(x)

‎libcmyth/posmap.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -29,8 +29,6 @@
2929
#include <stdlib.h>
3030
#include <unistd.h>
3131
#include <stdio.h>
32-
#include <mvp_refmem.h>
33-
#include <cmyth.h>
3432
#include <cmyth_local.h>
3533

3634
/*

‎libcmyth/proginfo.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -32,8 +32,6 @@
3232
#include <stdio.h>
3333
#include <errno.h>
3434
#include <string.h>
35-
#include <mvp_refmem.h>
36-
#include <cmyth.h>
3735
#include <cmyth_local.h>
3836

3937
/*

‎libcmyth/proglist.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -29,8 +29,6 @@
2929
#include <stdio.h>
3030
#include <errno.h>
3131
#include <string.h>
32-
#include <mvp_refmem.h>
33-
#include <cmyth.h>
3432
#include <cmyth_local.h>
3533

3634
/*

‎libcmyth/rec_num.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -27,8 +27,6 @@
2727
#include <stdio.h>
2828
#include <string.h>
2929
#include <errno.h>
30-
#include <mvp_refmem.h>
31-
#include <cmyth.h>
3230
#include <cmyth_local.h>
3331

3432
/*

‎libcmyth/recorder.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund, Jon Gettler
2+
* Copyright (C) 2004-2009, Eric Lund, Jon Gettler
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -33,8 +33,6 @@
3333
#include <errno.h>
3434
#include <string.h>
3535
#include <sys/time.h>
36-
#include <mvp_refmem.h>
37-
#include <cmyth.h>
3836
#include <cmyth_local.h>
3937

4038
#if 0

‎libcmyth/ringbuf.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -31,8 +31,6 @@
3131
#include <stdio.h>
3232
#include <errno.h>
3333
#include <string.h>
34-
#include <mvp_refmem.h>
35-
#include <cmyth.h>
3634
#include <cmyth_local.h>
3735
#include <string.h>
3836

‎include/mvp_string.h ‎libcmyth/safe_string.h

File renamed without changes.

‎libcmyth/socket.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -29,8 +29,6 @@
2929
#include <string.h>
3030
#include <ctype.h>
3131
#include <errno.h>
32-
#include <mvp_refmem.h>
33-
#include <cmyth.h>
3432
#include <cmyth_local.h>
3533

3634
#define __UNSIGNED "0123456789"

‎libcmyth/timestamp.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2004-2006, Eric Lund
2+
* Copyright (C) 2004-2009, Eric Lund
33
* http://www.mvpmc.org/
44
*
55
* This library is free software; you can redistribute it and/or
@@ -30,8 +30,6 @@
3030
#include <stdio.h>
3131
#include <errno.h>
3232
#include <string.h>
33-
#include <mvp_refmem.h>
34-
#include <cmyth.h>
3533
#include <cmyth_local.h>
3634
#include <time.h>
3735

0 commit comments

Comments
 (0)