Changeset 15311

Timestamp:

04/17/12 18:22:35 (11 years ago)

Author:

nit

Message:

[titan] fix networkbrowser and comp warnings

Location:

titan

Files:

• plugins/networkbrowser/networkbrowser.h (modified) (3 diffs)
• titan/epg.h (modified) (1 diff)
• titan/global.h (modified) (1 diff)
• titan/header.h (modified) (4 diffs)
• titan/ipkg.h (modified) (1 diff)
• titan/mipselport.h (modified) (1 diff)
• titan/sh4port.h (modified) (1 diff)

titan/plugins/networkbrowser/networkbrowser.h

@@ -664 +664 @@
 void getnetworkbrowser_dns(struct inetwork* net, struct menulist** mlist)
 {
+        int i = 0;
         netinfo* nInfo;
         char *tmpstr = NULL, *s = NULL;
 
-        if(net == NULL || mlist == NULL) return NULL;
+        if(net == NULL || mlist == NULL) return;
 
         s = ostrcat(s, net->ip, 1, 0);
@@ -704 +705 @@
 void getnetworkbrowser_cifs(struct menulist** mlist, char* s, char* r, char* u, char* p)
 {
+        int i = 0;
         char* tmpstr = NULL;
         shareinfo* sInfo;
@@ -741 +743 @@
         char* tmpstr = NULL;
         nfsinfo* nfsInfo;
-        int err = 0;
+        int i = 0, err = 0;
 
         if(s == NULL || r == NULL || mlist == NULL) return;

titan/titan/epg.h

@@ -1295 +1295 @@
                 if(nolongdesc == 0 && epgnode->desc != NULL)
                 {
-                        ret = zip(epgnode->desc, strlen(epgnode->desc) + 1, &zbuf, &zlen, 1);
+                        ret = ozip(epgnode->desc, strlen(epgnode->desc) + 1, &zbuf, &zlen, 1);
                         if(ret == 0)
                         {

titan/titan/global.h

@@ -2000 +2000 @@
 }
 
-int zip(char* inbuf, int inlen, char** outbuf, int* outlen, int level)
+int ozip(char* inbuf, int inlen, char** outbuf, int* outlen, int level)
 {
         int ret = 0;

titan/titan/header.h

@@ -43 +43 @@
 int ipkg_install(const char* package);
 int ipkg_remove(const char* package, int purge);
-char* ipk_listbox(char* defaultstr, char* str, char* skinname, char* skintitle, char* skinpath, int showpng);
+struct menulist* ipkmenulist(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* section, int showpng, int flag);
+int ipkg_list_installed(void);
 
 //frontenddev.h
@@ -329 +330 @@
 struct menulist* addmenulist(struct menulist** mlist, char* name, char* text, char* pic, int deaktiv, int defaultentry);
 struct menulist* menulistbox(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* defaultpic, int showpng, int flag);
+struct menulist* menulistboxext(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* defaultpic, int showpng, int* rcreturn, int flag);
 void setmenulistdefault(struct menulist* mlist, char* defaultentry);
+void changemenulistparam(struct menulist* mlist, char* param, char* param1);
 
 //skinfunc.h
@@ -336 +339 @@
 
 //skin.h
+void calcautoscale(int width, int height, int mwidth, int mheight, int* scalewidth, int* scaleheight);
 void blitscale(int posx, int posy, int width, int height, int scalewidth, int scaleheight, int flag);
 unsigned char* scale(unsigned char* buf, int width, int height, int channels, int newwidth, int newheight, int free1);
@@ -420 +424 @@
 char* string_strip_whitechars(char *text);
 int ounzip(char* inbuf, int inlen, char** outbuf, int* outlen, int maxbuf, int flag);
+int ozip(char* inbuf, int inlen, char** outbuf, int* outlen, int level);
 int delallfiles(char* dir, char* ext);
 unsigned long getfilecount(char* dir);

titan/titan/ipkg.h

@@ -354 +354 @@
                 if(ostrcmp("97.74.32.10", ip) == 0)
                 {
-                        if(ostrcmp(src, "//97.74.32.10/svn/ipk/sh4/titan") != 0)                 
+                        if(ostrcmp((char*)src, "//97.74.32.10/svn/ipk/sh4/titan") != 0)          
                         {
                                 textbox(_("Message"), _("check your Secret Feed !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0);                

titan/titan/mipselport.h

@@ -106 +106 @@
                 char* zbuf = NULL;
                 blitscale(0, 0, fbnode->width, fbnode->height, 440, 330, 1);
-                ret = zip((char*)accelfb->fb, 440 * 330 * 4, &zbuf, &zlen, 1);
+                ret = ozip((char*)accelfb->fb, 440 * 330 * 4, &zbuf, &zlen, 1);
 
                 if(ret == 0)

titan/titan/sh4port.h

@@ -33 +33 @@
                 char* zbuf = NULL;
                 blitscale(0, 0, fbnode->width, fbnode->height, 440, 330, 1);
-                ret = zip((char*)accelfb->fb, 440 * 330 * 4, &zbuf, &zlen, 1);
+                ret = ozip((char*)accelfb->fb, 440 * 330 * 4, &zbuf, &zlen, 1);
 
                 if(ret == 0)