src/rmd_jack.c

src/get_frame.c
src/parseargs.c
src/load_cache.c
src/cache_frame.c
src/flush_to_ogg.c
src/init_encoder.c
src/initialize_data.c
src/register_callbacks.c: Make file-local functions static.


git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@520 f606c939-3180-4ac9-a4b8-4b8779d57d0a

9 files changed, 41 insertions, 39 deletions

diff --git a/recordmydesktop/src/cache_frame.c b/recordmydesktop/src/cache_frame.c
index 5e75700..d12d57f 100644
--- a/recordmydesktop/src/cache_frame.c
+++ b/recordmydesktop/src/cache_frame.c
@@ -33,14 +33,14 @@
 #define CACHE_FILE_SIZE_LIMIT (500*1<<20)
 
 
-int FlushBlock(unsigned char *buf,
-               int blockno,
-               int width,
-               int height,
-               int blockwidth,
-               gzFile *fp,
-               FILE *ucfp,
-               int flush){
+static int FlushBlock(unsigned char *buf,
+                      int blockno,
+                      int width,
+                      int height,
+                      int blockwidth,
+                      gzFile *fp,
+                      FILE *ucfp,
+                      int flush) {
     int j,i,
         bytes_written=0,
         block_i=(!blockwidth)?0:(blockno/(width/blockwidth)),//place on the grid
diff --git a/recordmydesktop/src/flush_to_ogg.c b/recordmydesktop/src/flush_to_ogg.c
index b8a1b1e..8827503 100644
--- a/recordmydesktop/src/flush_to_ogg.c
+++ b/recordmydesktop/src/flush_to_ogg.c
@@ -30,7 +30,7 @@
 //will invalidate it. But we must have pages from
 //both streams at every time in
 //order to do correct multiplexing
-void ogg_page_cp(ogg_page *new,ogg_page *old){
+static void ogg_page_cp(ogg_page *new, ogg_page *old) {
     int i=0;
     register unsigned char *newp,*oldp;
 
@@ -50,7 +50,7 @@ void ogg_page_cp(ogg_page *new,ogg_page *old){
 
 }
 //free our copy
-void ogg_page_cp_free(ogg_page *pg){
+static void ogg_page_cp_free(ogg_page *pg) {
     pg->header_len=pg->body_len=0;
     free(pg->header);
     free(pg->body);
diff --git a/recordmydesktop/src/get_frame.c b/recordmydesktop/src/get_frame.c
index ab8ff9a..9f16a4b 100644
--- a/recordmydesktop/src/get_frame.c
+++ b/recordmydesktop/src/get_frame.c
@@ -148,8 +148,10 @@
 
 //besides taking the first screenshot, this functions primary purpose is to 
 //initialize the structures and memory.
-int FirstFrame(ProgData *pdata,XImage **image,XShmSegmentInfo *shminfo,
-               char **pxl_data){
+static int FirstFrame(ProgData *pdata,
+                      XImage **image,
+                      XShmSegmentInfo *shminfo,
+                      char **pxl_data) {
 
     if((pdata->args.noshared)){
 
@@ -216,7 +218,7 @@ int FirstFrame(ProgData *pdata,XImage **image,XShmSegmentInfo *shminfo,
 }
 
 //make a deep copy
-void BRWinCpy(BRWindow *target,BRWindow *source){
+static void BRWinCpy(BRWindow *target, BRWindow *source) {
 
     target->geom.x=source->geom.x;
     target->geom.y=source->geom.y;
@@ -233,11 +235,11 @@ void BRWinCpy(BRWindow *target,BRWindow *source){
 
 //recenters the capture area to the mouse
 //without exiting the display bounding box
-void MoveCaptureArea(   BRWindow *brwin,
-                        int cursor_x,
-                        int cursor_y,
-                        int width,
-                        int height){
+static void MoveCaptureArea(BRWindow *brwin,
+                            int cursor_x,
+                            int cursor_y,
+                            int width,
+                            int height) {
     int t_x=0,t_y=0;
 
     t_x=cursor_x-brwin->rgeom.width/2;
@@ -263,11 +265,11 @@ void MoveCaptureArea(   BRWindow *brwin,
 *
 * \param blocknum_y Height of image in blocks
 */
-void BlocksFromList (RectArea   **root,
-                     unsigned int x_offset,
-                     unsigned int y_offset,
-                     unsigned int blocknum_x,
-                     unsigned int blocknum_y) {
+static void BlocksFromList (RectArea   **root,
+                            unsigned int x_offset,
+                            unsigned int y_offset,
+                            unsigned int blocknum_x,
+                            unsigned int blocknum_y) {
 
   RectArea    *temp;
   unsigned int i,
diff --git a/recordmydesktop/src/init_encoder.c b/recordmydesktop/src/init_encoder.c
index b9413bc..c5da4d5 100644
--- a/recordmydesktop/src/init_encoder.c
+++ b/recordmydesktop/src/init_encoder.c
@@ -31,7 +31,7 @@
 #include "skeleton.h"
 
 
-void m_add_fishead_packet(ogg_stream_state *m_ogg_state){
+static void m_add_fishead_packet(ogg_stream_state *m_ogg_state) {
 
     fishead_packet skel_fp;
     
@@ -44,7 +44,7 @@ void m_add_fishead_packet(ogg_stream_state *m_ogg_state){
 }
 
 
-int IncrementalNaming(char **name){
+static int IncrementalNaming(char **name) {
     struct stat buff;
     char *base_name__;
     int i=0,
diff --git a/recordmydesktop/src/initialize_data.c b/recordmydesktop/src/initialize_data.c
index f6fe59d..30a0ab8 100644
--- a/recordmydesktop/src/initialize_data.c
+++ b/recordmydesktop/src/initialize_data.c
@@ -29,10 +29,10 @@
 
 
 #ifdef HAVE_LIBASOUND
-void FixBufferSize(snd_pcm_uframes_t *buffsize){
+static void FixBufferSize(snd_pcm_uframes_t *buffsize) {
     snd_pcm_uframes_t buffsize_t=*buffsize,
 #else
-void FixBufferSize(u_int32_t *buffsize){
+static void FixBufferSize(u_int32_t *buffsize) {
     u_int32_t buffsize_t=*buffsize,
 #endif
                           buffsize_ret=1;
diff --git a/recordmydesktop/src/load_cache.c b/recordmydesktop/src/load_cache.c
index 5130aa9..460331b 100644
--- a/recordmydesktop/src/load_cache.c
+++ b/recordmydesktop/src/load_cache.c
@@ -53,12 +53,12 @@ typedef struct _CachedFrame{
 }CachedFrame;
 
 
-void LoadBlock(unsigned char *dest,
-               unsigned char *source,
-               int blockno,
-               int width,
-               int height,
-               int blockwidth){
+static void LoadBlock(unsigned char *dest,
+                      unsigned char *source,
+                      int blockno,
+                      int width,
+                      int height,
+                      int blockwidth) {
     int j,
         block_i=blockno/(width/blockwidth),//place on the grid
         block_k=blockno%(width/blockwidth);
@@ -69,7 +69,7 @@ void LoadBlock(unsigned char *dest,
 }
 
 //returns number of bytes
-int ReadZF(void * buffer,size_t size,size_t nmemb,FILE *ucfp,gzFile *ifp){
+static int ReadZF(void * buffer, size_t size, size_t nmemb, FILE *ucfp, gzFile *ifp) {
     if((ifp!=NULL && ucfp!=NULL)||
        (ifp==NULL && ucfp==NULL))
         return -1;
@@ -80,7 +80,7 @@ int ReadZF(void * buffer,size_t size,size_t nmemb,FILE *ucfp,gzFile *ifp){
         return gzread(ifp,buffer,size*nmemb);
 }
 
-int ReadFrame(CachedFrame *frame,FILE *ucfp,gzFile *ifp){
+static int ReadFrame(CachedFrame *frame, FILE *ucfp, gzFile *ifp) {
     int index_entry_size=sizeof(u_int32_t);
     if(frame->header->Ynum>0){
         if(ReadZF(frame->YBlocks,
diff --git a/recordmydesktop/src/parseargs.c b/recordmydesktop/src/parseargs.c
index 5ceedd3..b6f38f3 100644
--- a/recordmydesktop/src/parseargs.c
+++ b/recordmydesktop/src/parseargs.c
@@ -28,7 +28,7 @@
 #include "recordmydesktop.h"
 
 
-void PrintConfig(void){
+static void PrintConfig(void) {
     fprintf(stderr,"\nrecordMyDesktop was compiled with"
                    " the following options:\n\n");
 #ifdef HAVE_JACK_H
diff --git a/recordmydesktop/src/register_callbacks.c b/recordmydesktop/src/register_callbacks.c
index c20a94b..7e9e090 100644
--- a/recordmydesktop/src/register_callbacks.c
+++ b/recordmydesktop/src/register_callbacks.c
@@ -28,14 +28,14 @@
 #include "recordmydesktop.h"
 
 
-void SetPaused(int signum){
+static void SetPaused(int signum) {
 
     PauseStateChanged=1;
 
 }
 
 
-void SetRunning(int signum){
+static void SetRunning(int signum) {
     
     if(!Paused){
         *Running=0;
diff --git a/recordmydesktop/src/rmd_jack.c b/recordmydesktop/src/rmd_jack.c
index 7dca73b..ed03a8a 100644
--- a/recordmydesktop/src/rmd_jack.c
+++ b/recordmydesktop/src/rmd_jack.c
@@ -205,7 +205,7 @@ static int LoadJackLib(void *jack_lib_handle) {
 //the program should stop recording,
 //encode the result(if not on the fly)
 //an exit cleanly.
-void JackShutdown(void *jdata_t){
+static void JackShutdown(void *jdata_t) {
     fprintf (stderr, "JACK shutdown\n");
     *Running=0;
 }