utils/dvb: Allow passing a FILE * parameter to dvb_fe_prt_parms

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/utils/dvb/dvb-fe-tool.c b/utils/dvb/dvb-fe-tool.c
index 93acd7e..5a82c33 100644 (file)
--- a/utils/dvb/dvb-fe-tool.c
+++ b/utils/dvb/dvb-fe-tool.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 #endif
        if (get) {
 //             dvb_fe_get_parms(parms);
-               dvb_fe_prt_parms(parms);
+               dvb_fe_prt_parms(stdout, parms);
        }
 
        dvb_fe_close(parms);

diff --git a/utils/dvb/dvb-fe.c b/utils/dvb/dvb-fe.c
index 88fd3f8..6f84970 100644 (file)
--- a/utils/dvb/dvb-fe.c
+++ b/utils/dvb/dvb-fe.c
@@ -227,12 +227,12 @@ int dvb_set_sys(struct dvb_v5_fe_parms *parms,
        return 0;
 }
 
-void dvb_fe_prt_parms(struct dvb_v5_fe_parms *parms)
+void dvb_fe_prt_parms(FILE *fp, const struct dvb_v5_fe_parms *parms)
 {
        int i;
 
        for (i = 0; i < parms->n_props; i++) {
-               const char **attr_name = dvbv5_attr_names[parms->dvb_prop[i].cmd];
+               const char * const *attr_name = dvbv5_attr_names[parms->dvb_prop[i].cmd];
                if (attr_name) {
                        int j;
 
@@ -244,11 +244,11 @@ void dvb_fe_prt_parms(struct dvb_v5_fe_parms *parms)
                }
 
                if (!attr_name || !*attr_name)
-                       printf("%s = %u\n",
+                       fprintf(fp, "%s = %u\n",
                                dvb_v5_name[parms->dvb_prop[i].cmd],
                                parms->dvb_prop[i].u.data);
                else
-                       printf("%s = %s\n",
+                       fprintf(fp, "%s = %s\n",
                                dvb_v5_name[parms->dvb_prop[i].cmd],
                                *attr_name);
        }
@@ -319,7 +319,7 @@ static int dvb_fe_get_parms(struct dvb_v5_fe_parms *parms)
                if (parms->verbose) {
                        printf("Got parameters for %s:",
                               delivery_system_name[parms->current_sys]);
-                       dvb_fe_prt_parms(parms);
+                       dvb_fe_prt_parms(stdout, parms);
                }
                return 0;
        }
@@ -377,7 +377,7 @@ int dvb_fe_set_parms(struct dvb_v5_fe_parms *parms)
                if (ioctl(parms->fd, FE_SET_PROPERTY, &prop) == -1) {
                        perror("FE_SET_PROPERTY");
                        if (parms->verbose)
-                               dvb_fe_prt_parms(parms);
+                               dvb_fe_prt_parms(stderr, parms);
                        return errno;
                }
                return 0;
@@ -419,7 +419,7 @@ int dvb_fe_set_parms(struct dvb_v5_fe_parms *parms)
        if (ioctl(parms->fd, FE_SET_FRONTEND, &v3_parms) == -1) {
                perror("FE_SET_FRONTEND");
                if (parms->verbose)
-                       dvb_fe_prt_parms(parms);
+                       dvb_fe_prt_parms(stderr, parms);
                return errno;
        }
        return 0;

diff --git a/utils/dvb/dvb-fe.h b/utils/dvb/dvb-fe.h
index 0c5fb77..2366a1d 100644 (file)
--- a/utils/dvb/dvb-fe.h
+++ b/utils/dvb/dvb-fe.h
@@ -63,7 +63,7 @@ int dvb_fe_store_parm(struct dvb_v5_fe_parms *parms,
                      unsigned cmd, uint32_t value);
 int dvb_set_sys(struct dvb_v5_fe_parms *parms,
                   fe_delivery_system_t sys);
-void dvb_fe_prt_parms(struct dvb_v5_fe_parms *parms);
+void dvb_fe_prt_parms(FILE *fp, const struct dvb_v5_fe_parms *parms);
 int dvb_fe_set_parms(struct dvb_v5_fe_parms *parms);
 
 /* Get statistics */
@@ -113,4 +113,4 @@ int dvb_fe_diseqc_reply(struct dvb_v5_fe_parms *parms, unsigned *len, char *buf,
 /* Arrays from dvb-v5.h */
 
 extern const unsigned fe_bandwidth_name[7];
-extern const char *dvb_v5_name[45];
\ No newline at end of file
+extern const char *dvb_v5_name[45];